Commit 462af927 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 45dcd959 cc0e156e

.bzrignore

+146 −0
Original line number Diff line number Diff line
@@ -134,6 +134,137 @@ autom4te.cache/* 
autom4te.cache/output.0

autom4te.cache/requests

autom4te.cache/traces.0

bdb/*.ds?

bdb/*.vcproj

bdb/README

bdb/btree/btree_auto.c

bdb/build_unix/*

bdb/build_vxworks/db.h

bdb/build_vxworks/db_int.h

bdb/build_win32/db.h

bdb/build_win32/db_archive.dsp

bdb/build_win32/db_checkpoint.dsp

bdb/build_win32/db_config.h

bdb/build_win32/db_cxx.h

bdb/build_win32/db_deadlock.dsp

bdb/build_win32/db_dll.dsp

bdb/build_win32/db_dump.dsp

bdb/build_win32/db_int.h

bdb/build_win32/db_java.dsp

bdb/build_win32/db_load.dsp

bdb/build_win32/db_perf.dsp

bdb/build_win32/db_printlog.dsp

bdb/build_win32/db_recover.dsp

bdb/build_win32/db_stat.dsp

bdb/build_win32/db_static.dsp

bdb/build_win32/db_tcl.dsp

bdb/build_win32/db_test.dsp

bdb/build_win32/db_upgrade.dsp

bdb/build_win32/db_verify.dsp

bdb/build_win32/ex_access.dsp

bdb/build_win32/ex_btrec.dsp

bdb/build_win32/ex_env.dsp

bdb/build_win32/ex_lock.dsp

bdb/build_win32/ex_mpool.dsp

bdb/build_win32/ex_tpcb.dsp

bdb/build_win32/excxx_access.dsp

bdb/build_win32/excxx_btrec.dsp

bdb/build_win32/excxx_env.dsp

bdb/build_win32/excxx_lock.dsp

bdb/build_win32/excxx_mpool.dsp

bdb/build_win32/excxx_tpcb.dsp

bdb/build_win32/include.tcl

bdb/build_win32/libdb.def

bdb/build_win32/libdb.rc

bdb/db/crdel_auto.c

bdb/db/db_auto.c

bdb/dbinc_auto/*.*

bdb/dbreg/dbreg_auto.c

bdb/dist/autom4te-2.53.cache/*

bdb/dist/autom4te-2.53.cache/output.0

bdb/dist/autom4te-2.53.cache/requests

bdb/dist/autom4te-2.53.cache/traces.0

bdb/dist/autom4te.cache/*

bdb/dist/autom4te.cache/output.0

bdb/dist/autom4te.cache/requests

bdb/dist/autom4te.cache/traces.0

bdb/dist/config.hin

bdb/dist/configure

bdb/dist/tags

bdb/dist/template/db_server_proc

bdb/dist/template/gen_client_ret

bdb/dist/template/rec_btree

bdb/dist/template/rec_crdel

bdb/dist/template/rec_db

bdb/dist/template/rec_dbreg

bdb/dist/template/rec_fileops

bdb/dist/template/rec_hash

bdb/dist/template/rec_log

bdb/dist/template/rec_qam

bdb/dist/template/rec_txn

bdb/examples_c/ex_apprec/ex_apprec_auto.c

bdb/examples_c/ex_apprec/ex_apprec_auto.h

bdb/examples_c/ex_apprec/ex_apprec_template

bdb/examples_java

bdb/fileops/fileops_auto.c

bdb/hash/hash_auto.c

bdb/include/btree_auto.h

bdb/include/btree_ext.h

bdb/include/clib_ext.h

bdb/include/common_ext.h

bdb/include/crdel_auto.h

bdb/include/db_auto.h

bdb/include/db_ext.h

bdb/include/db_server.h

bdb/include/env_ext.h

bdb/include/gen_client_ext.h

bdb/include/gen_server_ext.h

bdb/include/hash_auto.h

bdb/include/hash_ext.h

bdb/include/lock_ext.h

bdb/include/log_auto.h

bdb/include/log_ext.h

bdb/include/mp_ext.h

bdb/include/mutex_ext.h

bdb/include/os_ext.h

bdb/include/qam_auto.h

bdb/include/qam_ext.h

bdb/include/rpc_client_ext.h

bdb/include/rpc_server_ext.h

bdb/include/tcl_ext.h

bdb/include/txn_auto.h

bdb/include/txn_ext.h

bdb/include/xa_ext.h

bdb/java/src/com/sleepycat/db/Db.java

bdb/java/src/com/sleepycat/db/DbBtreeStat.java

bdb/java/src/com/sleepycat/db/DbConstants.java

bdb/java/src/com/sleepycat/db/DbHashStat.java

bdb/java/src/com/sleepycat/db/DbLockStat.java

bdb/java/src/com/sleepycat/db/DbLogStat.java

bdb/java/src/com/sleepycat/db/DbMpoolFStat.java

bdb/java/src/com/sleepycat/db/DbQueueStat.java

bdb/java/src/com/sleepycat/db/DbRepStat.java

bdb/java/src/com/sleepycat/db/DbTxnStat.java

bdb/libdb_java/java_stat_auto.c

bdb/libdb_java/java_stat_auto.h

bdb/log/log_auto.c

bdb/qam/qam_auto.c

bdb/rpc_client/db_server_clnt.c

bdb/rpc_client/gen_client.c

bdb/rpc_server/c/db_server_proc.c

bdb/rpc_server/c/db_server_proc.sed

bdb/rpc_server/c/db_server_svc.c

bdb/rpc_server/c/db_server_xdr.c

bdb/rpc_server/c/gen_db_server.c

bdb/rpc_server/db_server.x

bdb/rpc_server/db_server_proc.sed

bdb/rpc_server/db_server_svc.c

bdb/rpc_server/db_server_xdr.c

bdb/rpc_server/gen_db_server.c

bdb/test/TESTS

bdb/test/include.tcl

bdb/test/logtrack.list

bdb/txn/txn_auto.c

binary/*

bkpull.log

bkpull.log*
@@ -253,6 +384,7 @@ include/my_global.h 
include/mysql_version.h

include/mysqld_ername.h

include/mysqld_error.h

include/openssl

include/readline

include/readline/*.h

include/readline/readline.h
@@ -396,6 +528,7 @@ libmysqld/opt_range.cc 
libmysqld/opt_sum.cc

libmysqld/pack.c

libmysqld/parse_file.cc

libmysqld/partition_info.cc

libmysqld/password.c

libmysqld/procedure.cc

libmysqld/protocol.cc
@@ -550,18 +683,24 @@ mysql-test/r/*.out 
mysql-test/r/*.reject

mysql-test/r/alter_table.err

mysql-test/r/archive.err

mysql-test/r/backup.log

mysql-test/r/bdb-alter-table-1.err

mysql-test/r/bdb-alter-table-2.err

mysql-test/r/bdb-crash.err

mysql-test/r/bdb-deadlock.err

mysql-test/r/bdb.err

mysql-test/r/bdb.log

mysql-test/r/bdb_cache.err

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

mysql-test/r/derived.err

mysql-test/r/events.log

mysql-test/r/events_bugs.log

mysql-test/r/events_logs_tests.log

mysql-test/r/exampledb.err

mysql-test/r/func_encrypt.err

mysql-test/r/im_client_port.log

mysql-test/r/index_merge_load.result

mysql-test/r/isam.err

mysql-test/r/lowercase_table2.err
@@ -571,6 +710,7 @@ mysql-test/r/mysqlbinlog.err 
mysql-test/r/mysqlbinlog2.err

mysql-test/r/mysqldump.err

mysql-test/r/mysqltest.err

mysql-test/r/mysqltest.log

mysql-test/r/ndb_alter_table.err

mysql-test/r/ndb_autodiscover.err

mysql-test/r/ndb_autodiscover2.err
@@ -610,6 +750,9 @@ mysql-test/r/rpl000016.eval 
mysql-test/r/rpl_log.eval

mysql-test/r/slave-running.eval

mysql-test/r/slave-stopped.eval

mysql-test/r/symlink.log

mysql-test/r/system_mysql_db.log

mysql-test/r/udf.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/t/index_merge.load
@@ -934,6 +1077,7 @@ scripts/mysql_install_db 
scripts/mysql_secure_installation

scripts/mysql_setpermission

scripts/mysql_tableinfo

scripts/mysql_upgrade

scripts/mysql_zap

scripts/mysqlaccess

scripts/mysqlbug
@@ -1382,6 +1526,7 @@ storage/ndb/src/common/mgmcommon/printConfig/*.d 
storage/ndb/src/common/portlib/libportlib.dsp

storage/ndb/src/common/transporter/libtransporter.dsp

storage/ndb/src/common/util/libgeneral.dsp

storage/ndb/src/common/util/testBitmask.cpp

storage/ndb/src/cw/cpcd/ndb_cpcd

storage/ndb/src/dummy.cpp

storage/ndb/src/kernel/blocks/backup/libbackup.dsp
@@ -1613,3 +1758,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

mysql-test/r/*.log

BUILD/SETUP.sh

+5 −6
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ set -e 
export AM_MAKEFLAGS

AM_MAKEFLAGS="-j 4"



# SSL library to use. Should be changed to --with-yassl

SSL_LIBRARY=--with-openssl

# SSL library to use.

SSL_LIBRARY=--with-yassl



# If you are not using codefusion add "-Wpointer-arith" to WARNINGS

# The following warning flag will give too many warnings:
@@ -53,14 +53,13 @@ SSL_LIBRARY=--with-openssl 
# __attribute()__ doesn't work with gnu C++)



global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"

#debug_extra_warnings="-Wuninitialized"

c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-example-storage-engine --with-partition $SSL_LIBRARY"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-example-storage-engine --with-partition $SSL_LIBRARY"

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

max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"

valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"



path=`dirname $0`

. "$path/check-cpu"

BUILD/compile-amd64-debug-max

+1 −3
Original line number Diff line number Diff line 
#! /bin/sh

path=`dirname $0`

. "$path/SETUP.sh"

extra_flags="$amd64_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_flags="$amd64_cflags $debug_cflags"

extra_configs="$amd64_configs $debug_configs $max_configs"



. "$path/FINISH.sh"

BUILD/compile-amd64-debug-max-no-ndb

+1 −3
Original line number Diff line number Diff line 
#! /bin/sh

path=`dirname $0`

. "$path/SETUP.sh"

extra_flags="$amd64_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_flags="$amd64_cflags $debug_cflags"

extra_configs="$amd64_configs $debug_configs $max_no_ndb_configs"



. "$path/FINISH.sh"

BUILD/compile-amd64-max

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


path=`dirname $0`

. "$path/SETUP.sh"

extra_flags="$amd64_cflags $fast_cflags $max_cflags -g"

extra_flags="$amd64_cflags $fast_cflags -g"

extra_configs="$amd64_configs $max_configs"



. "$path/FINISH.sh"