Commit 494daf79 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 


sql/mysqld.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
parents 0b98c606 3380fd1d

.bzrignore

+143 −2
Original line number Diff line number Diff line 
*.a

*.bb

*.bbg

*.bin

*.core

*.d

*.da

*.exe

*.gcov

*.idb

*.la

*.lib

*.lo

*.map

*.o

*.obj

*.pch

*.pdb

*.reject

*.res

*.sbr

*.so

*.spec

*/*_pure_*warnings

*/.pure

*~

.*.swp

./README.build-files

./config.h

./copy_mysql_files.bat

./fix-project-files

./mysql*.ds?

./mysql.ncb

./mysql.sln

./mysql.suo

./prepare

.defs.mk

.depend

.depend.mk
@@ -115,6 +133,8 @@ 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/*
@@ -256,6 +276,9 @@ bkpush.log 
bkpush.log*

build.log

build_tags.sh

client/*.ds?

client/*.vcproj

client/completion_hash.cpp

client/decimal.c

client/insert_test

client/log_event.cc
@@ -265,9 +288,12 @@ client/mf_iocache.cc 
client/my_decimal.cc

client/my_decimal.h

client/mysql

client/mysql.cpp

client/mysqladmin

client/mysqladmin.c

client/mysqladmin.cpp

client/mysqlbinlog

client/mysqlbinlog.cpp

client/mysqlcheck

client/mysqldump

client/mysqlimport
@@ -278,14 +304,20 @@ client/mysqltest 
client/mysqltestmanager-pwgen

client/mysqltestmanagerc

client/mysys_priv.h

client/readline.cpp

client/select_test

client/sql_string.cpp

client/ssl_test

client/thimble

client/thread_test

client_debug/*

client_release/*

client_test

cmd-line-utils/libedit/common.h

cmd-line-utils/libedit/makelist

comon.h

comp_err/*.ds?

comp_err/*.vcproj

config.cache

config.guess

config.h
@@ -295,10 +327,14 @@ config.status 
config.sub

configure

configure.lineno

contrib/*.ds?

contrib/*.vcproj

core

core.*

core.2430

db-*.*.*

dbug/*.ds?

dbug/*.vcproj

dbug/dbug_analyze

dbug/example*.r

dbug/factorial
@@ -309,6 +345,9 @@ dbug/user.ps 
dbug/user.t

depcomp

emacs.h

examples/*.ds?

examples/*.vcproj

examples/udf_example/udf_example.def

extra/charset2html

extra/comp_err

extra/created_include_files
@@ -330,6 +369,8 @@ fcns.h 
gdbinit

gmon.out

hardcopy.0

heap/*.ds?

heap/*.vcproj

heap/hp_test1

heap/hp_test2

help
@@ -345,6 +386,8 @@ include/readline/*.h 
include/readline/readline.h

include/sql_state.h

include/widec.h

innobase/*.ds?

innobase/*.vcproj

innobase/autom4te-2.53.cache/*

innobase/autom4te-2.53.cache/output.0

innobase/autom4te-2.53.cache/requests
@@ -363,18 +406,28 @@ innobase/stamp-h1 
insert_test

install

install-sh

isam/*.ds?

isam/*.vcproj

isam/isamchk

isam/isamlog

isam/pack_isam

isam/test1

isam/test2

isam/test3

isamchk/*.ds?

isamchk/*.vcproj

lib_debug/*

lib_release/*

libmysql/*.c

libmysql/*.ds?

libmysql/*.vcproj

libmysql/conf_to_src

libmysql/debug/libmysql.exp

libmysql/my_static.h

libmysql/my_time.c

libmysql/mysys_priv.h

libmysql/net.c

libmysql/release/libmysql.exp

libmysql/vio_priv.h

libmysql_r/*.c

libmysql_r/acconfig.h
@@ -382,12 +435,15 @@ libmysql_r/conf_to_src 
libmysql_r/my_static.h

libmysql_r/mysys_priv.h

libmysql_r/vio_priv.h

libmysqld/*.ds?

libmysqld/*.vcproj

libmysqld/backup_dir

libmysqld/client.c

libmysqld/client_settings.h

libmysqld/convert.cc

libmysqld/derror.cc

libmysqld/discover.cc

libmysqld/emb_qcache.cpp

libmysqld/errmsg.c

libmysqld/examples/client_test.c

libmysqld/examples/client_test.cc
@@ -443,6 +499,7 @@ libmysqld/item_sum.cc 
libmysqld/item_timefunc.cc

libmysqld/item_uniq.cc

libmysqld/key.cc

libmysqld/lib_sql.cpp

libmysqld/libmysql.c

libmysqld/lock.cc

libmysqld/log.cc
@@ -500,6 +557,7 @@ libmysqld/sql_map.cc 
libmysqld/sql_olap.cc

libmysqld/sql_parse.cc

libmysqld/sql_partition.cc

libmysqld/sql_plugin.cc

libmysqld/sql_prepare.cc

libmysqld/sql_rename.cc

libmysqld/sql_repl.cc
@@ -516,6 +574,8 @@ libmysqld/sql_unions.cc 
libmysqld/sql_update.cc

libmysqld/sql_view.cc

libmysqld/sql_yacc.cc

libmysqld/sql_yacc.cpp

libmysqld/sql_yacc.h

libmysqld/stacktrace.c

libmysqld/strfunc.cc

libmysqld/table.cc
@@ -524,6 +584,9 @@ libmysqld/time.cc 
libmysqld/tztime.cc

libmysqld/uniques.cc

libmysqld/unireg.cc

libmysqltest/*.ds?

libmysqltest/*.vcproj

libmysqltest/mytest.c

libtool

linked_client_sources

linked_include_sources
@@ -536,6 +599,8 @@ linked_tools_sources 
locked

ltmain.sh

man/*.1

merge/*.ds?

merge/*.vcproj

missing

mit-pthreads/config.flags

mit-pthreads/include/bits
@@ -547,6 +612,10 @@ mit-pthreads/pg++ 
mit-pthreads/pgcc

mit-pthreads/syscall.S

mkinstalldirs

my_print_defaults/*.ds?

my_print_defaults/*.vcproj

myisam/*.ds?

myisam/*.vcproj

myisam/FT1.MYD

myisam/FT1.MYI

myisam/ft_dump
@@ -572,17 +641,31 @@ myisam/test1.MYD 
myisam/test1.MYI

myisam/test2.MYD

myisam/test2.MYI

myisam_ftdump/*.ds?

myisam_ftdump/*.vcproj

myisamchk/*.ds?

myisamchk/*.vcproj

myisamlog/*.ds?

myisamlog/*.vcproj

myisammrg/*.ds?

myisammrg/*.vcproj

myisampack/*.ds?

myisampack/*.vcproj

mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

mysql-4.0.2-alpha.tar.gz

mysql-4.1.8-win-src.zip

mysql-5.0.2-alpha.tar.gz

mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

mysql-test/*.ds?

mysql-test/*.vcproj

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/mysql-test-run

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/r/*.err

mysql-test/r/*.out

mysql-test/r/*.reject

mysql-test/r/alter_table.err

mysql-test/r/archive.err
@@ -654,13 +737,25 @@ mysql-test/var/* 
mysql.kdevprj

mysql.proj

mysql_priv.h

mysqlbinlog/*.ds?

mysqlbinlog/*.vcproj

mysqlcheck/*.ds?

mysqlcheck/*.vcproj

mysqld.S

mysqld.sym

mysqldemb/*.ds?

mysqldemb/*.vcproj

mysqlserver/*.ds?

mysqlserver/*.vcproj

mysys/#mf_iocache.c#

mysys/*.ds?

mysys/*.vcproj

mysys/charset2html

mysys/getopt.c

mysys/getopt1.c

mysys/main.cc

mysys/my_new.cpp

mysys/raid.cpp

mysys/ste5KbMa

mysys/test_charset

mysys/test_dir
@@ -924,13 +1019,20 @@ ndbcluster-1186/ndb_3.pid 
ndbcluster-1186/ndb_3_cluster.log

ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

pack_isam/*.ds?

perror/*.ds?

perror/*.vcproj

pull.log

regex/*.ds?

regex/*.vcproj

regex/re

repl-tests/test-repl-ts/repl-timestamp.master.reject

repl-tests/test-repl/foo-dump-slave.master.

repl-tests/test-repl/sum-wlen-slave.master.

repl-tests/test-repl/sum-wlen-slave.master.re

repl-tests/test-repl/sum-wlen-slave.master.reje

replace/*.ds?

replace/*.vcproj

scripts/fill_func_tables

scripts/fill_func_tables.sql

scripts/fill_help_tables
@@ -961,11 +1063,31 @@ scripts/mysqlhotcopy 
scripts/mysqlhotcopy.sh.rej

scripts/safe_mysqld

select_test

server-tools/instance-manager/buffer.cpp

server-tools/instance-manager/client.c

server-tools/instance-manager/client_settings.h

server-tools/instance-manager/command.cpp

server-tools/instance-manager/commands.cpp

server-tools/instance-manager/errmsg.c

server-tools/instance-manager/guardian.cpp

server-tools/instance-manager/instance.cpp

server-tools/instance-manager/instance_map.cpp

server-tools/instance-manager/instance_options.cpp

server-tools/instance-manager/listener.cpp

server-tools/instance-manager/log.cpp

server-tools/instance-manager/manager.cpp

server-tools/instance-manager/messages.cpp

server-tools/instance-manager/mysql_connection.cpp

server-tools/instance-manager/mysqlmanager

server-tools/instance-manager/mysqlmanager.cpp

server-tools/instance-manager/options.cpp

server-tools/instance-manager/parse.cpp

server-tools/instance-manager/parse_output.cpp

server-tools/instance-manager/priv.cpp

server-tools/instance-manager/protocol.cpp

server-tools/instance-manager/thr_alarm.c

server-tools/instance-manager/thread_registry.cpp

server-tools/instance-manager/user_map.cpp

sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686

sql-bench/bench-count-distinct

sql-bench/bench-init.pl
@@ -994,12 +1116,19 @@ sql-bench/test-insert 
sql-bench/test-select

sql-bench/test-transactions

sql-bench/test-wisconsin

sql/*.cpp

sql/*.ds?

sql/*.vcproj

sql/.gdbinit

sql/client.c

sql/gen_lex_hash

sql/gmon.out

sql/handlerton.cc

sql/lex_hash.h

sql/max/*

sql/message.h

sql/message.mc

sql/message.rc

sql/mini_client_errors.c

sql/my_time.c

sql/mysql_tzinfo_to_sql
@@ -1338,7 +1467,6 @@ storage/ndb/src/common/transporter/libtransporter.dsp 
storage/ndb/src/common/util/libgeneral.dsp

storage/ndb/src/cw/cpcd/ndb_cpcd

storage/ndb/src/dummy.cpp

storage/ndb/src/kernel/blocks/ndb_print_file

storage/ndb/src/kernel/blocks/backup/libbackup.dsp

storage/ndb/src/kernel/blocks/backup/ndb_print_backup_file

storage/ndb/src/kernel/blocks/backup/restore/ndb_restore
@@ -1355,6 +1483,7 @@ storage/ndb/src/kernel/blocks/dbtup/test_varpage 
storage/ndb/src/kernel/blocks/dbtux/libdbtux.dsp

storage/ndb/src/kernel/blocks/dbutil/libdbutil.dsp

storage/ndb/src/kernel/blocks/grep/libgrep.dsp

storage/ndb/src/kernel/blocks/ndb_print_file

storage/ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp

storage/ndb/src/kernel/blocks/ndbfs/libndbfs.dsp

storage/ndb/src/kernel/blocks/qmgr/libqmgr.dsp
@@ -1449,6 +1578,8 @@ storage/ndb/tools/ndb_show_tables.dsp 
storage/ndb/tools/ndb_test_platform

storage/ndb/tools/ndb_waiter

storage/ndb/tools/ndb_waiter.dsp

strings/*.ds?

strings/*.vcproj

strings/conf_to_src

strings/ctype_autoconf.c

strings/ctype_extra_sources.c
@@ -1529,10 +1660,15 @@ test/tools/hugoScanUpdate 
test/tools/ndb_cpcc

test/tools/restart

test/tools/verify_index

test1/*

test_xml

tests/*.ds?

tests/*.vcproj

tests/client_test

tests/connect_test

tests/mysql_client_test

thr_insert_test/*

thr_test/*

thread_test

tmp/*

tools/my_vsnprintf.c
@@ -1541,8 +1677,13 @@ tools/mysqlmngd 
tools/mysqltestmanager

tools/mysys_priv.h

vi.h

vio/*.ds?

vio/*.vcproj

vio/test-ssl

vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

libmysqld/sql_plugin.cc
 
vio/viotest-sslconnect.cpp

vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
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 $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"

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

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

BUILD/compile-pentium64-valgrind-max

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium64_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"

extra_flags="$pentium64_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



# We want to test isam when building with valgrind

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-raid --with-ndbcluster"

extra_configs="$extra_configs $max_leave_isam_configs --with-isam"



. "$path/FINISH.sh"

BUILD/compile-sap

deleted100755 → 0
+0 −9
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags"

extra_configs="$pentium_configs --without-berkeley-db"



. "$path/FINISH.sh"

BUILD/compile-sap-debug

deleted100755 → 0
+0 −9
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs --without-berkeley-db $static_link"



. "$path/FINISH.sh"