Commit 7df80faf authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents e2d25631 55f7266b

.bzrignore

+12 −6
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ client/my_decimal.h 
client/my_user.c

client/mysql

client/mysql.cpp

client/mysql_upgrade

client/mysqladmin

client/mysqladmin.c

client/mysqladmin.cpp
@@ -321,6 +322,7 @@ cmd-line-utils/libedit/makelist 
comon.h

comp_err/*.ds?

comp_err/*.vcproj

compile

config.cache

config.guess

config.h
@@ -367,6 +369,9 @@ extra/resolve_stack_dump 
extra/resolveip

extra/sql_state.h

extra/tztime.cc

extra/yassl/taocrypt/benchmark/benchmark

extra/yassl/taocrypt/test/test

extra/yassl/testsuite/testsuite

fcns.c

fcns.h

gdbinit
@@ -549,6 +554,7 @@ libmysqld/spatial.cc 
libmysqld/sql_acl.cc

libmysqld/sql_analyse.cc

libmysqld/sql_base.cc

libmysqld/sql_builtin.cc

libmysqld/sql_cache.cc

libmysqld/sql_class.cc

libmysqld/sql_command
@@ -679,6 +685,7 @@ mysql-test/mysql-test-run.log 
mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/r/*.err

mysql-test/r/*.log

mysql-test/r/*.out

mysql-test/r/*.reject

mysql-test/r/alter_table.err
@@ -1174,6 +1181,7 @@ sql/share/gmon.out 
sql/share/mysql

sql/share/norwegian-ny/errmsg.sys

sql/share/norwegian/errmsg.sys

sql/sql_builtin.cc

sql/sql_select.cc.orig

sql/sql_yacc.cc

sql/sql_yacc.h
@@ -1747,6 +1755,10 @@ tools/mysqlmanager 
tools/mysqlmngd

tools/mysqltestmanager

tools/mysys_priv.h

unittest/examples/*.t

unittest/mysys/*.t

unittest/mytap/t/*.t

unittest/unit

vi.h

vio/*.ds?

vio/*.vcproj
@@ -1758,9 +1770,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
mysql-test/r/*.log

client/mysql_upgrade

unittest/examples/*.t

unittest/mysys/*.t

unittest/mytap/t/*.t

unittest/unit

BUILD/SETUP.sh

+4 −12
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max" 
# Used in -debug builds

debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "

debug_cflags="$debug_cflags -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"

error_inject="--with-error-inject "

#

# Base C++ flags for all builds

base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
@@ -146,18 +147,9 @@ static_link="$static_link --with-client-ldflags=-all-static" 
local_infile_configs="--enable-local-infile"





max_configs="--with-innodb --with-berkeley-db"

max_configs="$max_configs --with-archive-storage-engine"

max_configs="$max_configs --with-big-tables"

max_configs="$max_configs --with-blackhole-storage-engine"

max_configs="$max_configs --with-federated-storage-engine"

max_configs="$max_configs --with-csv-storage-engine"

max_configs="$max_configs --with-example-storage-engine"

max_configs="$max_configs --with-partition $SSL_LIBRARY"



max_no_embedded_configs="$max_configs --with-ndbcluster"

max_no_ndb_configs="$max_configs --without-ndbcluster --with-embedded-server"

max_configs="$max_configs --with-ndbcluster --with-embedded-server"

max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"

max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server"

max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server"



#

# CPU and platform specific compilation flags.

BUILD/autorun.sh

+5 −2
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 


die() { echo "$@"; exit 1; }



(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)



aclocal || die "Can't execute aclocal" 

autoheader || die "Can't execute autoheader"

# --force means overwrite ltmain.sh script if it already exists
@@ -17,5 +22,3 @@ fi 
# and --force to overwrite them if they already exist

automake --add-missing --force || die "Can't execute automake"

autoconf || die "Can't execute autoconf"
 
(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)

BUILD/compile-dist

+4 −2
Original line number Diff line number Diff line
@@ -7,13 +7,15 @@ 
# package" that is used as the basis for all other binary builds.

#

make distclean

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)

aclocal

autoheader

libtoolize --automake --force --copy

automake --force --add-missing --copy

autoconf

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)



# Default to gcc for CC and CXX

if test -z "$CXX" ; then

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ path=`dirname $0` 
. "$path/SETUP.sh" "$@" --with-debug=full



extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs $max_configs"

extra_configs="$pentium_configs $debug_configs $max_configs $error_inject"



. "$path/FINISH.sh"