Browse Source
Fixed problems in merge
Fixed problems in merge
mysql-test/r/information_schema.result: Fixed a result file. mysql-test/r/innodb-autoinc.result: Fixed a result file. mysql-test/t/connect.test: Fixed a problem with merge, needed to close connections and use the defaultpull/843/head
Michael Widenius
17 years ago
69 changed files with 225 additions and 283 deletions
-
10BUILD/SETUP.sh
-
2BUILD/build_mccge.sh
-
8BUILD/compile-dist
-
5BUILD/compile-pentium64-max
-
77BUILD/compile-solaris-amd64
-
13BUILD/compile-solaris-amd64-debug
-
70BUILD/compile-solaris-amd64-forte
-
65BUILD/compile-solaris-amd64-forte-debug
-
2BUILD/compile-solaris-sparc-purify
-
10include/m_string.h
-
16include/my_global.h
-
3mysql-test/Makefile.am
-
8mysql-test/lib/mtr_unique.pm
-
6mysql-test/r/information_schema.result
-
1mysql-test/r/innodb-autoinc.result
-
4mysql-test/t/connect.test
-
4mysql-test/t/pool_of_threads.cnf
-
2mysys/mf_qsort.c
-
6mysys/my_alloc.c
-
2mysys/my_init.c
-
2mysys/my_rnd.c
-
2mysys/safemalloc.c
-
2scripts/mysql_config.pl.in
-
2scripts/mysql_config.sh
-
2sql/field_conv.cc
-
4sql/filesort.cc
-
4sql/ha_partition.cc
-
2sql/hostname.cc
-
4sql/item_timefunc.cc
-
10sql/log_event.cc
-
12sql/log_event_old.cc
-
2sql/my_decimal.h
-
16sql/mysqld.cc
-
2sql/opt_range.cc
-
4sql/opt_range.h
-
2sql/records.cc
-
2sql/rpl_rli.cc
-
2sql/rpl_rli.h
-
4sql/set_var.cc
-
2sql/slave.cc
-
4sql/sql_base.cc
-
6sql/sql_binlog.cc
-
2sql/sql_class.cc
-
2sql/sql_list.h
-
2sql/sql_load.cc
-
12sql/sql_select.cc
-
4sql/table.cc
-
2storage/archive/azio.c
-
2storage/innobase/buf/buf0buf.c
-
8storage/innobase/include/univ.i
-
2storage/innobase/srv/srv0start.c
-
2storage/maria/ha_maria.cc
-
2storage/maria/ma_blockrec.c
-
6storage/maria/ma_check.c
-
4storage/maria/ma_loghandler.c
-
2storage/maria/ma_packrec.c
-
2storage/maria/ma_page.c
-
2storage/maria/ma_pagecrc.c
-
2storage/maria/ma_search.c
-
4storage/myisam/mi_check.c
-
2storage/myisam/mi_page.c
-
2storage/myisam/mi_search.c
-
2storage/myisammrg/ha_myisammrg.cc
-
2storage/pbxt/src/Makefile.am
-
4storage/pbxt/src/lock_xt.h
-
18storage/pbxt/src/pbms.h
-
4strings/bcmp.c
-
2strings/decimal.c
-
4strings/strmake.c
@ -1,55 +1,32 @@ |
|||
#!/usr/bin/bash |
|||
#!/bin/sh |
|||
|
|||
function _find_mysql_root () ( |
|||
while [ "x$PWD" != "x/" ]; do |
|||
# Check if some directories are present |
|||
if [ -d BUILD -a -d sql -a -d mysys ]; then |
|||
echo "$PWD" |
|||
return 0 |
|||
fi |
|||
cd .. |
|||
done |
|||
return 1 |
|||
) |
|||
# Build setup for Solaris 10 |
|||
|
|||
# Make the Sun Freeware packages use the bundled Perl, instead of their own: |
|||
# ln -s `which perl` /usr/local/bin |
|||
# Your $PATH needs to include (in this order): |
|||
# /usr/local/bin:/usr/sfw/bin:/usr/ccs/bin |
|||
# (For Sun Freeware, bundled GNU utilities, Solaris ar, etc.) |
|||
# |
|||
# Required packages from http://sunfreeware.com/indexintel10.html : |
|||
# (The GNU m4 bundled with Solaris is too old.) |
|||
# automake-1.10.2-sol10-x86-local.gz |
|||
# autoconf-2.63-sol10-x86-local.gz |
|||
# m4-1.4.12-sol10-x86-local.gz |
|||
# libsigsegv-2.6-sol10-x86-local.gz |
|||
# libtool-1.5.24-sol10-x86-local.gz |
|||
# ( how to install these packages: |
|||
# wget ftp://ftp.sunfreeware.com/pub/freeware/intel/10/automake-1.10.2-sol10-x86-local.gz |
|||
# gunzip automake-1.10.2-sol10-x86-local.gz |
|||
# pkgadd -d automake-1.10.2-sol10-x86-local |
|||
# ) |
|||
|
|||
make -k clean || true |
|||
/bin/rm -f */.deps/*.P config.cache |
|||
|
|||
path=`dirname $0` |
|||
. "$path/autorun.sh" |
|||
|
|||
warning_flags="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused" |
|||
compiler_flags="-g -O3 -fno-omit-frame-pointer" |
|||
. "$path/SETUP.sh" |
|||
extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64" |
|||
extra_configs="$amd64_configs $max_configs --with-libevent" |
|||
|
|||
export CC CXX CFLAGS CXXFLAGS LDFLAGS LIBS |
|||
CC="gcc" |
|||
CXX="gcc" |
|||
CFLAGS="$warning_flags $compiler_flags" |
|||
CXXFLAGS="" |
|||
LDFLAGS="-O3 -g -static-libgcc" |
|||
LIBS=-lmtmalloc |
|||
root=$(_find_mysql_root) |
|||
LDFLAGS="-lmtmalloc -static-libgcc" |
|||
export LDFLAGS |
|||
|
|||
$root/configure \ |
|||
--prefix=/usr/local/mysql \ |
|||
--localstatedir=/usr/local/mysql/data \ |
|||
--libexecdir=/usr/local/mysql/bin \ |
|||
--with-extra-charsets=complex \ |
|||
--enable-thread-safe-client \ |
|||
--enable-local-infile \ |
|||
--with-zlib-dir=bundled \ |
|||
--with-big-tables \ |
|||
--with-readline \ |
|||
--with-archive-storage-engine \ |
|||
--with-named-curses=-lcurses \ |
|||
--with-big-tables \ |
|||
--with-innodb \ |
|||
--with-berkeley-db \ |
|||
--with-example-storage-engine \ |
|||
--with-blackhole-storage-engine \ |
|||
--with-ndbcluster \ |
|||
--with-federated-storage-engine \ |
|||
--with-csv-storage-engine \ |
|||
--with-ssl \ |
|||
--with-embedded-server \ |
|||
--disable-shared |
|||
. "$path/FINISH.sh" |
|||
@ -1,10 +1,11 @@ |
|||
#! /bin/sh |
|||
#!/bin/sh |
|||
|
|||
path=`dirname $0` |
|||
. "$path/SETUP.sh" |
|||
amd64_cflags="-m64 -mtune=athlon64" |
|||
extra_flags="$amd64_cflags $debug_cflags $max_cflags" |
|||
c_warnings="$c_warnings $debug_extra_warnings" |
|||
cxx_warnings="$cxx_warnings $debug_extra_warnings" |
|||
extra_configs="$amd64_configs $debug_configs $max_configs --enable-thread-safe-client" |
|||
extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64 $debug_cflags" |
|||
extra_configs="$amd64_configs $debug_configs $max_configs --with-libevent" |
|||
|
|||
LDFLAGS="-lmtmalloc -static-libgcc" |
|||
export LDFLAGS |
|||
|
|||
. "$path/FINISH.sh" |
|||
@ -1,53 +1,29 @@ |
|||
#! /bin/sh |
|||
#!/bin/sh |
|||
|
|||
gmake -k clean || true |
|||
/bin/rm -f */.deps/*.P config.cache |
|||
|
|||
path=`dirname $0` |
|||
. "$path/autorun.sh" |
|||
# See file compile-solaris-amd64 for basic pre-requisites. |
|||
|
|||
# This build uses the Sun Studio compilers (cc, CC), available from: |
|||
# http://developers.sun.com/sunstudio/downloads/index.jsp |
|||
# Note that you may want to apply current patches, as the downloaded version |
|||
# is typically out of date. Download the PKG version if you intend to patch! |
|||
|
|||
# After installing, add /opt/SUNWspro/bin to your $PATH |
|||
|
|||
# For "optimal" code for this computer add -fast to EXTRA |
|||
# To compile 64 bit, add -m64 to EXTRA_64_BIT |
|||
|
|||
EXTRA_64_BIT="-m64" |
|||
EXTRA="-fast" |
|||
path=`dirname $0` |
|||
. "$path/SETUP.sh" |
|||
|
|||
extra_flags="-m64 -mt -D_FORTEC_ -xbuiltin=%all -xlibmil -xlibmopt -fns=no -xprefetch=auto -xprefetch_level=3" |
|||
extra_configs="$max_configs --with-libevent" |
|||
|
|||
# |
|||
# The following should not need to be touched |
|||
# |
|||
warnings="" |
|||
c_warnings="" |
|||
cxx_warnings="" |
|||
base_cxxflags="-noex" |
|||
|
|||
export CC CXX CFLAGS CXXFLAGS LIBS |
|||
STD="-g -mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT" |
|||
ASFLAGS="$EXTRA_64_BIT" |
|||
CC=cc-5.0 |
|||
CFLAGS="-Xa -xstrconst $STD" |
|||
CC=cc |
|||
CFLAGS="-xstrconst" |
|||
CXX=CC |
|||
CXXFLAGS="-noex $STD" |
|||
LIBS=-lmtmalloc |
|||
./configure \ |
|||
--prefix=/usr/local/mysql \ |
|||
--localstatedir=/usr/local/mysql/data \ |
|||
--libexecdir=/usr/local/mysql/bin \ |
|||
--with-extra-charsets=complex \ |
|||
--enable-thread-safe-client \ |
|||
--enable-local-infile \ |
|||
--with-zlib-dir=bundled \ |
|||
--with-big-tables \ |
|||
--with-readline \ |
|||
--with-archive-storage-engine \ |
|||
--with-named-curses=-lcurses \ |
|||
--with-big-tables \ |
|||
--with-innodb \ |
|||
--with-example-storage-engine \ |
|||
--with-blackhole-storage-engine \ |
|||
--with-federated-storage-engine \ |
|||
--with-csv-storage-engine \ |
|||
--with-ssl \ |
|||
--enable-assembler |
|||
|
|||
# Not including: |
|||
# --with-ndbcluster |
|||
# --with-berkeley-db |
|||
|
|||
gmake -j4 |
|||
test $? = 0 && make test |
|||
LDFLAGS="-lmtmalloc" |
|||
|
|||
. "$path/FINISH.sh" |
|||
@ -1,54 +1,27 @@ |
|||
#! /bin/sh |
|||
#!/bin/sh |
|||
|
|||
gmake -k clean || true |
|||
/bin/rm -f */.deps/*.P config.cache |
|||
|
|||
path=`dirname $0` |
|||
. "$path/autorun.sh" |
|||
. "$path/SETUP.sh" |
|||
|
|||
# To compile 64 bit, add -m64 to EXTRA_64_BIT |
|||
EXTRA_64_BIT="-m64" |
|||
# Take only #define options - the others are gcc specific. |
|||
# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags) |
|||
DEFS="" |
|||
for F in $debug_cflags ; do |
|||
expr "$F" : "^-D" && DEFS="$DEFS $F" |
|||
done |
|||
debug_cflags="-O0 -g $DEFS" |
|||
|
|||
# For "optimal" code for this computer add -fast to EXTRA. Note that |
|||
# this causes problem with debugging the program since -fast implies |
|||
# -xO5. |
|||
EXTRA="" |
|||
extra_flags="-m64 -mt -D_FORTEC_ -xlibmopt -fns=no $debug_cflags" |
|||
extra_configs="$max_configs --with-libevent $debug_configs" |
|||
|
|||
# |
|||
# The following should not need to be touched |
|||
# |
|||
warnings="" |
|||
c_warnings="" |
|||
cxx_warnings="" |
|||
base_cxxflags="-noex" |
|||
|
|||
export CC CXX CFLAGS CXXFLAGS |
|||
STD="-g -mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT $debug_cflags" |
|||
ASFLAGS="$EXTRA_64_BIT" |
|||
CC=cc-5.0 |
|||
CFLAGS="-Xa -xstrconst $STD" |
|||
CC=cc |
|||
CFLAGS="-xstrconst" |
|||
CXX=CC |
|||
CXXFLAGS="-noex $STD" |
|||
./configure \ |
|||
--prefix=/usr/local/mysql \ |
|||
--localstatedir=/usr/local/mysql/data \ |
|||
--libexecdir=/usr/local/mysql/bin \ |
|||
--with-extra-charsets=complex \ |
|||
--enable-thread-safe-client \ |
|||
--enable-local-infile \ |
|||
--with-zlib-dir=bundled \ |
|||
--with-big-tables \ |
|||
--with-readline \ |
|||
--with-archive-storage-engine \ |
|||
--with-named-curses=-lcurses \ |
|||
--with-big-tables \ |
|||
--with-innodb \ |
|||
--with-example-storage-engine \ |
|||
--with-blackhole-storage-engine \ |
|||
--with-federated-storage-engine \ |
|||
--with-csv-storage-engine \ |
|||
--with-ssl \ |
|||
--with-debug \ |
|||
--enable-assembler |
|||
LDFLAGS="-lmtmalloc" |
|||
|
|||
# Not including: |
|||
# --with-ndbcluster |
|||
# --with-berkeley-db |
|||
|
|||
gmake -j4 |
|||
. "$path/FINISH.sh" |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue