Merge bk://mysql.bkbits.net/mysql-5.0

into avenger.(none):/export/brian/mysql/mysql-5.0

.bzrignore

@@ -2,6 +2,7 @@
 *.bb
 *.bbg
 *.core
+*.d
 *.da
 *.gcov
 *.la
@@ -13,6 +14,9 @@
 */.pure
 *~
 .*.swp
+.defs.mk
+.depend
+.depend.mk
 .deps
 .gdb_history
 .gdbinit
@@ -250,6 +254,7 @@ client/thimble
 client/thread_test
 client_test
 cmd-line-utils/libedit/common.h
+cmd-line-utils/libedit/makelist
 comon.h
 config.cache
 config.h
@@ -267,11 +272,13 @@ emacs.h
 extra/comp_err
 extra/my_print_defaults
 extra/mysql_install
+extra/mysql_tzinfo_to_sql
 extra/mysql_waitpid
 extra/perror
 extra/replace
 extra/resolve_stack_dump
 extra/resolveip
+extra/tztime.cc
 fcns.c
 fcns.h
 gmon.out
@@ -283,6 +290,7 @@ help.h
 include/my_config.h
 include/my_global.h
 include/mysql_version.h
+include/readline
 include/readline/*.h
 include/readline/readline.h
 include/widec.h
@@ -300,6 +308,7 @@ innobase/ib_config.h
 innobase/ib_config.h.in
 innobase/stamp-h1
 insert_test
+install
 isam/isamchk
 isam/isamlog
 isam/pack_isam
@@ -309,6 +318,7 @@ isam/test3
 libmysql/*.c
 libmysql/conf_to_src
 libmysql/my_static.h
+libmysql/my_time.c
 libmysql/mysys_priv.h
 libmysql/net.c
 libmysql/vio_priv.h
@@ -323,7 +333,9 @@ libmysqld/client.c
 libmysqld/client_settings.h
 libmysqld/convert.cc
 libmysqld/derror.cc
+libmysqld/discover.cc
 libmysqld/errmsg.c
+libmysqld/examples/client_test.c
 libmysqld/examples/completion_hash.cc
 libmysqld/examples/completion_hash.h
 libmysqld/examples/link_sources
@@ -361,6 +373,7 @@ libmysqld/item_func.cc
 libmysqld/item_geofunc.cc
 libmysqld/item_row.cc
 libmysqld/item_strfunc.cc
+libmysqld/item_subselect.cc
 libmysqld/item_sum.cc
 libmysqld/item_timefunc.cc
 libmysqld/item_uniq.cc
@@ -372,12 +385,14 @@ libmysqld/log_event.cc
 libmysqld/md5.c
 libmysqld/mf_iocache.cc
 libmysqld/mini_client.cc
+libmysqld/my_time.c
 libmysqld/net_pkg.cc
 libmysqld/net_serv.cc
 libmysqld/opt_ft.cc
 libmysqld/opt_range.cc
 libmysqld/opt_sum.cc
 libmysqld/pack.c
+libmysqld/parse_file.cc
 libmysqld/password.c
 libmysqld/procedure.cc
 libmysqld/protocol.cc
@@ -402,6 +417,7 @@ libmysqld/sql_command
 libmysqld/sql_crypt.cc
 libmysqld/sql_db.cc
 libmysqld/sql_delete.cc
+libmysqld/sql_derived.cc
 libmysqld/sql_do.cc
 libmysqld/sql_handler.cc
 libmysqld/sql_help.cc
@@ -431,6 +447,7 @@ libmysqld/strfunc.cc
 libmysqld/table.cc
 libmysqld/thr_malloc.cc
 libmysqld/time.cc
+libmysqld/tztime.cc
 libmysqld/uniques.cc
 libmysqld/unireg.cc
 libtool
@@ -443,6 +460,7 @@ linked_libmysqldex_sources
 linked_server_sources
 linked_tools_sources
 locked
+man/*.1
 mit-pthreads/config.flags
 mit-pthreads/include/bits
 mit-pthreads/include/pthread/machdep.h
@@ -465,6 +483,7 @@ myisam/mi_test2
 myisam/mi_test3
 myisam/mi_test_all
 myisam/myisam.log
+myisam/myisam_ftdump
 myisam/myisamchk
 myisam/myisamlog
 myisam/myisampack
@@ -482,6 +501,7 @@ mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
 mysql-test/gmon.out
 mysql-test/install_test_db
 mysql-test/mysql-test-run
+mysql-test/ndb/ndbcluster
 mysql-test/r/*.reject
 mysql-test/r/rpl000001.eval
 mysql-test/r/rpl000002.eval
@@ -496,6 +516,7 @@ mysql-test/std_data/*.pem
 mysql-test/var/*
 mysql.kdevprj
 mysql.proj
+mysql_priv.h
 mysqld.S
 mysqld.sym
 mysys/#mf_iocache.c#
@@ -506,11 +527,136 @@ mysys/main.cc
 mysys/ste5KbMa
 mysys/test_charset
 mysys/test_dir
+mysys/test_gethwaddr
 mysys/test_io_cache
 mysys/test_thr_alarm
 mysys/test_thr_lock
 mysys/test_vsnprintf
 mysys/testhash
+ndb/bin/DbAsyncGenerator
+ndb/bin/DbCreate
+ndb/bin/acid
+ndb/bin/async-lmc-bench-l-p10.sh
+ndb/bin/async-lmc-bench-l.sh
+ndb/bin/async-lmc-bench-p10.sh
+ndb/bin/async-lmc-bench.sh
+ndb/bin/atrt
+ndb/bin/atrt-analyze-result.sh
+ndb/bin/atrt-clear-result.sh
+ndb/bin/atrt-gather-result.sh
+ndb/bin/atrt-setup.sh
+ndb/bin/bankCreator
+ndb/bin/bankMakeGL
+ndb/bin/bankSumAccounts
+ndb/bin/bankTimer
+ndb/bin/bankTransactionMaker
+ndb/bin/bankValidateAllGLs
+ndb/bin/basicTransporterTest
+ndb/bin/benchronja
+ndb/bin/bulk_copy
+ndb/bin/copy_tab
+ndb/bin/create_all_tabs
+ndb/bin/create_index
+ndb/bin/create_tab
+ndb/bin/delete_all
+ndb/bin/desc
+ndb/bin/drop_all_tabs
+ndb/bin/drop_index
+ndb/bin/drop_tab
+ndb/bin/flexAsynch
+ndb/bin/flexBench
+ndb/bin/flexHammer
+ndb/bin/flexScan
+ndb/bin/flexTT
+ndb/bin/hugoCalculator
+ndb/bin/hugoFill
+ndb/bin/hugoLoad
+ndb/bin/hugoLockRecords
+ndb/bin/hugoPkDelete
+ndb/bin/hugoPkRead
+ndb/bin/hugoPkReadRecord
+ndb/bin/hugoPkUpdate
+ndb/bin/hugoScanRead
+ndb/bin/hugoScanUpdate
+ndb/bin/index
+ndb/bin/index2
+ndb/bin/initronja
+ndb/bin/interpreterInTup
+ndb/bin/list_tables
+ndb/bin/make-config.sh
+ndb/bin/mgmtclient
+ndb/bin/mgmtsrvr
+ndb/bin/mkconfig
+ndb/bin/ndb
+ndb/bin/ndb_cpcc
+ndb/bin/ndb_cpcd
+ndb/bin/ndb_rep
+ndb/bin/ndbsql
+ndb/bin/newton_basic
+ndb/bin/newton_br
+ndb/bin/newton_pb
+ndb/bin/newton_perf
+ndb/bin/perfTransporterTest
+ndb/bin/printConfig
+ndb/bin/printSchemafile
+ndb/bin/printSysfile
+ndb/bin/redoLogFileReader
+ndb/bin/restart
+ndb/bin/restarter
+ndb/bin/restarter2
+ndb/bin/restarts
+ndb/bin/restore
+ndb/bin/select_all
+ndb/bin/select_count
+ndb/bin/telco
+ndb/bin/testBackup
+ndb/bin/testBank
+ndb/bin/testBasic
+ndb/bin/testBasicAsynch
+ndb/bin/testCopy
+ndb/bin/testDataBuffers
+ndb/bin/testDict
+ndb/bin/testGrep
+ndb/bin/testGrepVerify
+ndb/bin/testIndex
+ndb/bin/testInterpreter
+ndb/bin/testKernelDataBuffer
+ndb/bin/testLongSig
+ndb/bin/testMgm
+ndb/bin/testMgmapi
+ndb/bin/testNdbApi
+ndb/bin/testNodeRestart
+ndb/bin/testOIBasic
+ndb/bin/testOdbcDriver
+ndb/bin/testOperations
+ndb/bin/testRestartGci
+ndb/bin/testScan
+ndb/bin/testScanInterpreter
+ndb/bin/testSimplePropertiesSection
+ndb/bin/testSystemRestart
+ndb/bin/testTimeout
+ndb/bin/testTransactions
+ndb/bin/test_cpcd
+ndb/bin/test_event
+ndb/bin/verify_index
+ndb/bin/waiter
+ndb/config/autom4te.cache/*
+ndb/config/config.mk
+ndb/examples/ndbapi_example1/ndbapi_example1
+ndb/examples/ndbapi_example2/ndbapi_example2
+ndb/examples/ndbapi_example3/ndbapi_example3
+ndb/examples/ndbapi_example5/ndbapi_example5
+ndb/examples/select_all/select_all
+ndb/lib/libMGM_API.so
+ndb/lib/libNDB_API.so
+ndb/lib/libNDB_ODBC.so
+ndb/lib/libNEWTON_API.so
+ndb/lib/libNEWTON_BASICTEST_COMMON.so
+ndb/lib/libREP_API.so
+ndb/lib/libndbclient.so
+ndb/lib/libndbclient_extra.so
+ndb/src/common/mgmcommon/printConfig/*.d
+ndb/src/mgmclient/test_cpcd/*.d
 pull.log
 regex/re
 repl-tests/test-repl-ts/repl-timestamp.master.reject
@@ -524,6 +670,7 @@ scripts/fill_help_tables
 scripts/fill_help_tables.sql
 scripts/make_binary_distribution
 scripts/make_sharedlib_distribution
+scripts/make_win_binary_distribution
 scripts/make_win_src_distribution
 scripts/msql2mysql
 scripts/mysql_config
@@ -580,6 +727,10 @@ sql/gen_lex_hash
 sql/gmon.out
 sql/lex_hash.h
 sql/mini_client_errors.c
+sql/my_time.c
+sql/mysql_tzinfo_to_sql
+sql/mysql_tzinfo_to_sql.cc
+sql/mysql_tzinfo_to_sql_tztime.cc
 sql/mysqlbinlog
 sql/mysqld
 sql/mysqld-purecov
@@ -599,6 +750,7 @@ sql/sql_yacc.cc
 sql/sql_yacc.h
 sql/sql_yacc.output
 sql/sql_yacc.yy.orig
+sql/test_time
 sql/udf_example.so
 sql_error.cc
 sql_prepare.cc
@@ -647,4 +799,5 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-mysql_priv.h
+libmysqld/sql_view.cc
+libmysqld/examples/client_test.cc

BUILD/Makefile.am

@@ -37,6 +37,7 @@ EXTRA_DIST =		FINISH.sh \
 			compile-pentium-pgcc \
 			compile-solaris-sparc \
 			compile-solaris-sparc-debug \
+			compile-irix-mips64-mipspro \
 			compile-solaris-sparc-forte \
 			compile-solaris-sparc-purify
 

BUILD/compile-irix-mips64-mipspro

+#!/bin/sh
+
+if [ ! -f "sql/mysqld.cc" ]; then
+  echo "You must run this script from the MySQL top-level directory."
+  exit 1
+fi
+
+cflags="-64 -mips4"
+
+if [ "$#" != 0 ]; then
+  case "$1" in
+    --help)
+      echo "Usage: $0 [options]"
+      echo "Options:" 
+      echo "--help                print this message"
+      echo "-32                   build 32-bit binary"
+      echo "-64                   build 64-bit binary [default]"
+      exit 0
+      ;;
+    -64)
+      echo "Building 64-bit binary"
+      ;;
+    -32)
+      echo "Building 32-bit binary"
+      cflags=""
+      ;;
+    *)
+      echo "$0: invalid option '$1'; use --help to show usage"
+      exit 1
+      ;;
+  esac
+else
+  echo "Building 64-bit binary"
+fi
+
+set -x
+make distclean
+aclocal
+autoheader
+libtoolize --automake --force
+automake --force --add-missing
+autoconf
+
+(cd bdb/dist && sh s_all)
+(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+
+# C options:
+# -apo          - auto-parallize for multiprocessors (implies -mp)
+# -mp           - generate multiprocessor code
+# These two common optimization options apparently use 'sproc' model of
+# threading, which is not compatible with PTHREADS: don't add them unless you
+# know what you're doing.
+#
+# -c99          - enable C features standardized in C99, such as long long,
+#                 strtoll, stroull etc.
+#                 This option is vital to compile MySQL.
+# -woff         - turn off some warnings 
+# -64           - generate 64 bit object (implies -mips4)
+# -mips4        - produce code for MIPS R10000, MIPS R12000 and further 64 bit
+#                 processors
+# -OPT:Olimit=0 - no limits exists to size of function for compiler to optimize
+#                 it
+nowarn="-woff 1064,1188,1460,1552,1681,1682,3303"
+cflags="$cflags $nowarn -O3 -c99 -OPT:Olimit=0"
+
+# C++ only options:
+# -LANG:exceptions=OFF            - don't generate exception handling code
+#                                   MySQL doesn't use exceptions.
+# -LANG:std=OFF                   - don't link standard C++ library, such as
+#                                   <iostream>, <complex>, etc. 
+# -LANG:libc_in_namespace_std=OFF - libstdc functions can be  
+#                                   declared in namespace 'std', when included
+#                                   into C++ code. Switch this feature off.
+#                                   This option is vital to compile MySQL
+
+cxxflags="$cflags -LANG:exceptions=OFF -LANG:std=OFF"
+cxxflags="$cxxflags -LANG:libc_in_namespace_std=OFF"
+
+CC=cc CXX=CC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \
+./configure --prefix=/usr/local/mysql --disable-shared \
+            --with-extra-charsets=complex --enable-thread-safe-client \
+            --without-extra-tools --disable-dependency-tracking
+
+make 

BUILD/compile-pentium-debug-max

@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid"
+extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-max-no-embedded

+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="$pentium_cflags $debug_cflags"
+c_warnings="$c_warnings $debug_extra_warnings"
+cxx_warnings="$cxx_warnings $debug_extra_warnings"
+extra_configs="$pentium_configs $debug_configs"
+
+extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-openssl --with-raid"
+
+. "$path/FINISH.sh"

BUILD/compile-pentium-maintainer

-#! /bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_flags="$pentium_cflags $debug_cflags"
-c_warnings="$c_warnings $debug_extra_warnings"
-cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs "
-
-extra_configs="$extra_configs --enable-maintainer-mode"
-
-. "$path/FINISH.sh"

BUILD/compile-pentium-max

@@ -7,8 +7,13 @@ extra_flags="$pentium_cflags $fast_cflags -g"
 extra_configs="$pentium_configs"
 #strip=yes
 
+#extra_configs="$extra_configs --with-innodb --with-berkeley-db \
+#	--with-embedded-server --enable-thread-safe-client \
+#	--with-openssl --with-vio --with-raid --with-ndbcluster"
+# removed per discussion with Brian and Sanja because it makes Bootstrap
+# fail
 extra_configs="$extra_configs --with-innodb --with-berkeley-db \
 	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio"
+	--with-openssl --with-vio --with-raid --with-ndbcluster"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-valgrind-max

@@ -3,7 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify"
+extra_flags="$pentium_cflags $debug_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"

BitKeeper/etc/config

@@ -71,3 +71,4 @@ hours:
 [arjen:]checkout:get
 [nick:]checkout:get
 checkout:edit
+eoln:unix

BitKeeper/etc/logging_ok

@@ -2,6 +2,7 @@ Administrador@light.
 Administrator@co3064164-a.
 Administrator@co3064164-a.rochd1.qld.optushome.com.au
 Administrator@fred.
+Greg@greg-laptop.
 Miguel@light.local
 Sinisa@sinisa.nasamreza.org
 WAX@sergbook.mysql.com
@@ -9,32 +10,45 @@ acurtis@pcgem.rdg.cyberkinetica.com
 administrador@light.hegel.local
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
 akishkin@work.mysql.com
+antony@ltantony.dsl-verizon.net
+antony@ltantony.rdg.cyberkinetica.com
 antony@ltantony.rdg.cyberkinetica.homeunix.net
+arjen@bitbike.com
 arjen@co3064164-a.bitbike.com
 arjen@fred.bitbike.com
 arjen@george.bitbike.com
+autotest@mc01.ndb.mysql.com
 bar@bar.intranet.mysql.r18.ru
 bar@bar.mysql.r18.ru
 bar@bar.udmsearch.izhnet.ru
+bar@deer.(none)
 bar@gw.udmsearch.izhnet.ru
+bar@mysql.com
 bell@laptop.sanja.is.com.ua
 bell@sanja.is.com.ua
 bk@admin.bk
 bk@mysql.r18.ru
 brian@avenger.(none)
+brian@brian-akers-computer.local
 carsten@tsort.bitbybit.dk
 davida@isil.mysql.com
+dlenev@brandersnatch.localdomain
 dlenev@build.mysql.com
+dlenev@jabberwock.localdomain
 dlenev@mysql.com
+ejonore@mc03.ndb.mysql.com
+georg@beethoven.local
 gerberb@ou800.zenez.com
 gluh@gluh.(none)
 gluh@gluh.mysql.r18.ru
+gordon@zero.local.lan
 greg@gcw.ath.cx
 greg@mysql.com
 guilhem@mysql.com
 gweir@build.mysql.com
 gweir@work.mysql.com
 harrison@mysql.com
+harry@corona.lordblink.com
 heikki@donna.mysql.fi
 heikki@hundin.mysql.fi
 heikki@rescue.
@@ -46,6 +60,8 @@ hf@deer.mysql.r18.ru
 hf@genie.(none)
 igor@hundin.mysql.fi
 igor@rurik.mysql.com
+ingo@mysql.com
+jani@a80-186-24-72.elisa-laajakaista.fi
 jani@dsl-jkl1657.dial.inet.fi
 jani@dsl-kpogw4gb5.dial.inet.fi
 jani@hynda.(none)
@@ -55,24 +71,33 @@ jani@linux.local
 jani@rhols221.adsl.netsonic.fi
 jani@rhols221.arenanet.fi
 jani@ua126d19.elisa.omakaista.fi
+jani@ua141d10.elisa.omakaista.fi
 jani@ua167d18.elisa.omakaista.fi
+jani@ua72d24.elisa.omakaista.fi
 jcole@abel.spaceapes.com
 jcole@main.burghcom.com
+jcole@mugatu.jcole.us
 jcole@mugatu.spaceapes.com
 jcole@sarvik.tfr.cafe.ee
 jcole@tetra.spaceapes.com
+joreland@mysql.com
 jorge@linux.jorge.mysql.com
+jplindst@t41.(none)
 kaj@work.mysql.com
 konstantin@mysql.com
 kostja@oak.local
 lenz@kallisto.mysql.com
 lenz@mysql.com
+magnus@neptunus.(none)
+marko@hundin.mysql.fi
 miguel@hegel.(none)
 miguel@hegel.br
 miguel@hegel.local
+miguel@hegel.txg
 miguel@light.
 miguel@light.local
 miguel@sartre.local
+mikron@mikael-ronstr-ms-dator.local
 mmatthew@markslaptop.
 monty@bitch.mysql.fi
 monty@butch.
@@ -80,6 +105,7 @@ monty@donna.mysql.fi
 monty@hundin.mysql.fi
 monty@mashka.(none)
 monty@mashka.mysql.fi
+monty@mishka.local
 monty@mishka.mysql.fi
 monty@mysql.com
 monty@narttu.
@@ -89,18 +115,29 @@ monty@tik.
 monty@tik.mysql.fi
 monty@tramp.mysql.fi
 monty@work.mysql.com
+mronstrom@mysql.com
+mskold@mysql.com
+msvensson@build.mysql.com
 mwagner@cash.mwagner.org
 mwagner@evoq.mwagner.org
+mwagner@here.mwagner.org
 mwagner@work.mysql.com
+mydev@mysql.com
 mysql@home.(none)
 mysqldev@build.mysql2.com
+mysqldev@melody.local
+mysqldev@mysql.com
+ndbdev@ndbmaster.mysql.com
 nick@mysql.com
 nick@nick.leippe.com
 papa@gbichot.local
+patg@krsna.patg.net
 paul@central.snake.net
 paul@ice.local
 paul@ice.snake.net
+paul@kite-hub.kitebird.com
 paul@teton.kitebird.com
+pekka@mysql.com
 pem@mysql.com
 pem@per-erik-martins-dator.local
 peter@linux.local
@@ -121,8 +158,10 @@ root@x3.internalnet
 salle@banica.(none)
 salle@geopard.(none)
 salle@geopard.online.bg
+salle@vafla.home
 salle@vafla.online.bg
 sasha@mysql.sashanet.com
+serg@build.mysql.com
 serg@build.mysql2.com
 serg@serg.mylan
 serg@serg.mysql.com
@@ -136,14 +175,24 @@ tfr@sarvik.tfr.cafe.ee
 tim@bitch.mysql.fi
 tim@black.box
 tim@hundin.mysql.fi
+tim@sand.box
 tim@threads.polyesthetic.msg
 tim@white.box
 tim@work.mysql.com
+timour@mysql.com
 tom@basil-firewall.home.com
+tomas@mc05.(none)
+tomas@poseidon.(none)
+tomas@poseidon.bredbandsbolaget.se
+tomas@poseidon.elisa-laajakaista.fi
+tomas@poseidon.ndb.mysql.com
 tonu@hundin.mysql.fi
 tonu@volk.internalnet
 tonu@x153.internalnet
 tonu@x3.internalnet
+tsmith@build.mysql.com
+tulin@build.mysql.com
+ulli@morbus.(none)
 venu@hundin.mysql.fi
 venu@myvenu.com
 venu@work.mysql.com

BitKeeper/triggers/post-commit

 #!/bin/sh
 
 #shift
-TO=dev-public@mysql.com
 FROM=$USER@mysql.com
 INTERNALS=internals@lists.mysql.com
 DOCS=docs-commit@mysql.com
 LIMIT=10000
-REPOV=5.0
+VERSION="5.0"
 
 if [ "$REAL_EMAIL" = "" ]
 then
@@ -21,17 +20,24 @@ if [ "$BK_STATUS" = OK ]
 then 
 
 CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
+BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/ BUG#\1/p'`
 
+if [ "$BUG" = "" ]
+then
+  TO=dev-public@mysql.com
+else
+  TO=dev-bugs@mysql.com
+fi
 #++
-# dev-public@
+# dev-public@ / dev-bugs@
 #--
  echo "Commit successful, notifying developers at $TO"
  (
    cat <<EOF
-List-ID: <bk.mysql-$REPOV>
+List-ID: <bk.mysql-$VERSION>
 From: $FROM
 To: $TO
-Subject: bk commit - $REPOV tree ($CHANGESET)
+Subject: bk commit - $VERSION tree ($CHANGESET)$BUG
 
 EOF
   bk changes -v -r+
@@ -44,13 +50,13 @@ EOF
  echo "Notifying internals list at $INTERNALS"
  (
    cat <<EOF
-List-ID: <bk.mysql-$REPOV>
+List-ID: <bk.mysql-$VERSION>
 From: $FROM
 To: $INTERNALS
-Subject: bk commit into $REPOV tree ($CHANGESET)
+Subject: bk commit into $VERSION tree ($CHANGESET)
 
 Below is the list of changes that have just been committed into a local
-$REPOV repository of $USER. When $USER does a push these changes will
+$VERSION repository of $USER. When $USER does a push these changes will
 be propagated to the main repository and, within 24 hours after the
 push, to the public repository.
 For information on how to access the public repository
@@ -71,10 +77,10 @@ EOF
   echo "Notifying docs list at $DOCS"
   (
     cat <<EOF
-List-ID: <bk.mysql-$REPOV>
+List-ID: <bk.mysql-$VERSION>
 From: $FROM
 To: $DOCS
-Subject: bk commit - $REPOV tree (Manual) ($CHANGESET)
+Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)
 
 EOF
   bk changes -v -r+

BitKeeper/triggers/pre-delta

+#!/bin/sh
+
+if [ `tail -c1 $BK_FILE` ]
+then
+ echo "File $BK_FILE does not end with a new-line character!"
+ echo ""
+ echo "Checkin FAILED!"
+ echo "Fix the problem and retry."
+ exit 1
+fi
+

Build-tools/Bootstrap

@@ -46,6 +46,7 @@ $opt_test= undef;
 $opt_skip_check= undef;
 $opt_skip_manual= undef;
 $opt_win_dist= undef;
+$opt_quiet= undef;
 $version= "unknown";
 $major=$minor=$release=0;
 
@@ -67,7 +68,8 @@ GetOptions(
 	"suffix=s",
 	"test|t",
 	"verbose|v",
-	"win-dist|w"
+	"win-dist|w",
+        "quiet|q",
 ) || print_help("");
 
 #
@@ -99,8 +101,6 @@ if (defined $opt_build_command)
 print_help("") if ($opt_help);
 defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!");
 
-$subject= "Bootstrap of $REPO failed" if $opt_mail;
-
 &logger("Starting build");
 &abort("The directory \"$REPO\" could not be found!") if (!-d $REPO);
 &logger("Using $REPO as the BK parent repository");
@@ -257,7 +257,7 @@ if (defined $opt_changelog)
 	$msg= "Adding $target_dir/ChangeLog";
 	$msg.= " (down to revision $opt_changelog)" if $opt_changelog ne "";
 	&logger($msg);
-	$command= "bk changes -v";
+	$command= "bk changes -mv";
 	$command.= " -r" if ($opt_changelog ne "" || $opt_revision);
 	$command.= $opt_changelog if $opt_changelog ne "";
 	$command.= ".." if ($opt_changelog ne "" && !$opt_revision);
@@ -306,7 +306,7 @@ if (!$opt_dry_run)
 #
 # Now build the source distribution
 #
-&logger("Compiling");
+&logger("Compiling...");
 $command= $build_command;
 &run_command($command, "Compilation failed!");
 
@@ -403,6 +403,7 @@ Options:
                            include a log file snippet, if logging is enabled)
                            Note that the \@-Sign needs to be quoted!
                            Example: --mail=user\\\@domain.com
+-q, --quiet                Be quiet
 -p, --pull                 Update the source BK trees before building
 -r, --revision=<rev>       Export the tree as of revision <rev>
                            (default is up to the latest revision)

Build-tools/Do-compile

@@ -7,16 +7,17 @@ use Sys::Hostname;
 @config_options= ();
 @make_options= ();
 
-$opt_distribution=$opt_user=$opt_config_env="";
+$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env="";
 $opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";
 $opt_tmp=$opt_version_suffix="";
-$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;
-$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=0;
+$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_cluster=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;
+$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;
 
 GetOptions(
 	"bdb",
 	"build-thread=i",
 	"config-env=s" => \@config_env,
+	"config-extra-env=s" => \@config_extra_env,
 	"config-options=s" => \@config_options,
 	"dbd-options=s",
 	"debug",
@@ -50,11 +51,13 @@ GetOptions(
 	"use-old-distribution",
 	"user=s",
 	"version-suffix=s",
+	"with-cluster",
 	"with-debug",
 	"with-low-memory",
 	"with-other-libc=s",
 	"with-small-disk",
 	"without-embedded",
+	"clearlogs",
 ) || usage();
 
 usage() if ($opt_help);
@@ -78,6 +81,12 @@ if (@config_env > 0)
 	$opt_config_env= join(" ", @config_env);
 }
 
+if (@config_extra_env > 0)
+{
+	chomp(@config_extra_env);
+	$opt_config_extra_env= join(" ", @config_extra_env);
+}
+
 $host= hostname();
 chomp($uname=`uname`);
 $full_host_name=$host;
@@ -88,6 +97,7 @@ $email="$opt_user\@mysql.com";
 chomp($pwd = `pwd`);
 $VER= basename($opt_distribution);
 $VER=~ /mysql.*-([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\.tar*/; $version=$1;
+$release="";			# Shut up perl
 ($major, $minor, $release) = split(/\./,$version);
 $log="$pwd/Logs/$host-$major.$minor$opt_version_suffix.log";
 $opt_distribution =~ /(mysql[^\/]*)\.tar/;
@@ -110,6 +120,8 @@ if (defined($gcc_version) && ! $opt_config_env)
   }
 }
 
+$opt_config_env.=" $opt_config_extra_env";
+
 $new_opt_tmp=0;
 if ($opt_tmp)
 {
@@ -136,10 +148,11 @@ $ENV{'MYSQL_TCP_PORT'}= $mysql_tcp_port= 3334 + $opt_build_thread*2;
 $ENV{'MYSQL_UNIX_PORT'}=$mysql_unix_port="$opt_tmp/mysql$opt_suffix.build";
 $ENV{"PERL5LIB"}="$pwd/$host/perl5:$pwd/$host/perl5/site_perl";
 $slave_port=$mysql_tcp_port+16;
+$ndbcluster_port= 9350 + $opt_build_thread*2;
 $manager_port=$mysql_tcp_port+1;
 $mysqladmin_args="--no-defaults -u root --connect_timeout=5 --shutdown_timeout=20";
 
-if ($opt_stage == 0)
+if ($opt_stage == 0 || $opt_clearlogs)
 {
   system("mkdir Logs") if (! -d "Logs");
   system("mv $log ${log}-old") if (-f $log);
@@ -153,8 +166,22 @@ select STDOUT;
 $|=1;
 
 info("Compiling MySQL$opt_version_suffix at $host$opt_suffix, stage: $opt_stage\n");
+info("LD_LIBRARY_PATH is $ENV{LD_LIBRARY_PATH}");
+info("PATH is $ENV{PATH}");
+
 log_timestamp();
 
+$md5_result= safe_system("perl $ENV{HOME}/my_md5sum -c ${opt_distribution}.md5");
+
+if ($md5_result != 0)
+{
+  abort("MD5 check failed for $opt_distribution!");
+}
+else
+{
+  info("SUCCESS: MD5 checks for $opt_distribution");
+}
+
 if (-x "$host/bin/mysqladmin")
 {
   log_system("$host/bin/mysqladmin $mysqladmin_args -S $mysql_unix_port -s shutdown");
@@ -234,19 +261,27 @@ if ($opt_stage <= 1)
   $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);
   $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);
   $opt_config_options.= " --with-raid" if ($opt_raid);
-  $opt_config_options.= " --with-readline" if ($opt_readline);
-  $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);
-
-  # Only enable InnoDB when requested (required to be able to
-  # build the "Classic" packages that do not include InnoDB)
-	if ($opt_innodb)
+	if ($opt_readline)
 	{
-		$opt_config_options.= " --with-innodb";
+  	$opt_config_options.= " --with-readline";
 	}
 	else
 	{
-		$opt_config_options.= " --without-innodb";
+		$opt_config_options.= " --with-libedit";
 	}
+  $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);
+  $opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);
+
+  # Only enable InnoDB when requested (required to be able to
+  # build the "Classic" packages that do not include InnoDB)
+  if ($opt_innodb)
+  {
+    $opt_config_options.= " --with-innodb";
+  }
+  else
+  {
+    $opt_config_options.= " --without-innodb";
+  }
 
   if ($opt_with_other_libc)
   {
@@ -282,16 +317,17 @@ if ($opt_stage <= 3)
 {
   my $flags= "";
   log_timestamp();
-  log_system("rm -fr mysql-3* mysql-4* $pwd/$host/*.tar.gz");
+  log_system("rm -fr mysql-{3,4,5}* $pwd/$host/mysql*.t*gz");
   # No need to add the debug symbols, if the binaries are not stripped (saves space)
   unless ($opt_with_debug || $opt_no_strip)
   {
     log_system("nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz | cat");
   }
 
-  $flags.= "--no-strip" if ($opt_no_strip || $opt_with_debug);
+  $flags.= " --no-strip" if ($opt_no_strip || $opt_with_debug);
+  $flags.= " --with-ndbcluster" if ($opt_with_cluster);
   check_system("scripts/make_binary_distribution --tmp=$opt_tmp --suffix=$opt_suffix $flags",".tar.gz created");
-  safe_system("mv mysql*.tar.gz $pwd/$host");
+  safe_system("mv mysql*.t*gz $pwd/$host");
   if (-f "client/.libs/mysqladmin")
   {
     safe_system("cp client/.libs/mysqladmin $pwd/$host/bin");
@@ -303,11 +339,13 @@ if ($opt_stage <= 3)
   safe_system("$make clean") if ($opt_with_small_disk);
 }
 
-$tar_file=<$pwd/$host/*.tar.gz>;
-if (!defined($tar_file))
-{
-  $tar_file=<$pwd/$host/*.tgz>;
-}
+$tar_file=<$pwd/$host/mysql*.t*gz>;
+abort ("Could not find tarball!") unless ($tar_file);
+
+# Generate the MD5 for the binary distribution
+$tar_file=~ /(mysql[^\/]*)\.(tar\.gz|tgz)/;
+$tar_file_lite= "$1.$2";
+system("cd $pwd/$host; perl $ENV{HOME}/my_md5sum $tar_file_lite > ${tar_file_lite}.md5");
 
 #
 # Unpack the binary distribution
@@ -320,7 +358,7 @@ if ($opt_stage <= 4 && !$opt_no_test)
   safe_system("gunzip < $tar_file | $tar xf -");
 }
 
-$tar_file =~ /(mysql[^\/]*)\.tar/;
+$tar_file =~ /(mysql[^\/]*)\.(tar\.gz|tgz)/;
 $ver=$1;
 $test_dir="$pwd/$host/test/$ver";
 $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
@@ -331,10 +369,12 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
 #
 if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
 {
+  my $flags= "";
+  $flags.= " --with-ndbcluster" if ($opt_with_cluster);
   log_timestamp();
   system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);
   safe_cd("${test_dir}/mysql-test");
-  check_system("./mysql-test-run --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+  check_system("./mysql-test-run $flags --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
 }
 
 #
@@ -445,16 +485,25 @@ exit 0;
 sub usage
 {
 print <<EOF;
-$0  version 1.5
+$0  version 1.6
 
 $0 takes the following options:
 
 --bdb
 Compile with support for Berkeley DB tables
 
+--build-thread=<1,2,3...>
+When running several Do-compile runs in parallel, each build
+should have its own thread ID, so running the test suites
+does not cause conflicts with duplicate TCP port numbers.
+
 --config-env=<environment for configure>
 To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3'
 
+--config-extra-env <environment for configure>
+Additional flags for environment (not CC or CXX). Should be used when one
+wants Do-compile to propose proper CC and CXX flags.
+
 --config-options=<options>
 To add some extra options to configure (e.g. '--with-perl=yes')
 
@@ -550,6 +599,9 @@ If user is empty then no mail is sent.
 --version-suffix=suffix
 Set name suffix (e.g. 'com' or '-max') for a distribution
 
+--with cluster
+Compile and test with NDB Cluster enabled
+
 --with-debug
 Build binaries with debug information (implies "--no-strip")
 
@@ -624,7 +676,10 @@ sub safe_system
   my($com,$res)=@_;
   print LOG "$com\n";
   print "$host: $com\n" if ($opt_debug);
-  system("$com >> $log 2>&1") && abort("error: Couldn't execute command, error: " . ($? / 256));
+  my $result= system("$com >> $log 2>&1");
+  abort("error: Couldn't execute command, error: " . ($? / 256)) unless $result == 0;
+
+  return $result;
 }
 
 sub check_system

Build-tools/Do-pkg

@@ -61,6 +61,12 @@ else
 }
 
 $PM= "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker";
+# Try another location on 10.3.3
+unless (-e "$PM")
+{
+	$PM= "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker";
+}
+
 $TMP= $ENV{TMPDIR};
 $TMP eq "" ?  $TMP= $TMP . "/PKGBUILD.$$": $TMP= "/tmp/PKGBUILD.$$";
 $PKGROOT= "$TMP/PMROOT";
@@ -79,6 +85,9 @@ $BUILDDIR= "$PWD/$HOST";
 $SRCBASEDIR= <$BUILDDIR/mysql*-$VERSION>;
 $SUPFILEDIR= <$SRCBASEDIR/support-files/MacOSX>;
 $TAR= <$BUILDDIR/$NAME-apple-darwin*-powerpc.tar.gz>;
+$TAR =~ /.*\/$NAME(.*)\.tar\.gz$/;
+$ARCH= $1;
+$NAME= $NAME . $ARCH;
 $INFO= <$SUPFILEDIR/Info.plist>;
 $DESC= <$SUPFILEDIR/Description.plist>;
 $SI_INFO= <$SUPFILEDIR/StartupItem.Info.plist>;
@@ -86,7 +95,8 @@ $SI_DESC= <$SUPFILEDIR/StartupItem.Description.plist>;
 $SI_PARAMS= <$SUPFILEDIR/StartupParameters.plist>;
 $SI_POST= <$SUPFILEDIR/StartupItem.postinstall>;
 $SI_NAME= "MySQLStartupItem";
-$SI_SCRIPT= <$SUPFILEDIR/MySQL>;
+$SI_DIR_NAME= "MySQLCOM";
+$SI_SCRIPT= <$SUPFILEDIR/MySQLCOM>;
 @RESOURCES= qw/ ReadMe.txt postinstall preinstall /;
 @LICENSES= ("$SRCBASEDIR/COPYING","$SRCBASEDIR/MySQLEULA.txt");
 
@@ -167,7 +177,7 @@ unless (-f "$RESOURCE_DIR/License.txt");
 &logger("Extracting $TAR to $PKGROOT");
 &run_command("gnutar zxf $TAR -C $PKGROOT", "Unable to extract $TAR!");
 &run_command("cd $PKGROOT ; ln -s mysql* ./mysql", "Unable to create symlink!");
-&run_command("chown -R root.wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
+&run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
 
 # Now build the PGK using PackageMaker
 # The "|| true" is a nasty hack to work around a problem with Package Maker
@@ -186,17 +196,19 @@ unless ($opt_skip_si)
 	&logger("Cleaning up $RESOURCE_DIR");
 	&run_command("rm -rf $RESOURCE_DIR/*", "Unable to clean up $RESOURCE_DIR!");
 
-	&logger("Installing MySQL StartupItem files into $PKGROOT/MySQL");
+	my $SI_DIR= $PKGROOT . "/" . $SI_DIR_NAME;
+	&logger("Installing MySQL StartupItem files into $SI_DIR");
 	unless($opt_dry_run)
 	{
-		mkdir("$PKGROOT/MySQL") or &abort("Error creating $PKGROOT/MySQL");
-		copy("$SI_SCRIPT", "$PKGROOT/MySQL/")
+		mkdir("$SI_DIR")
+			or &abort("Error creating $SI_DIR");
+		copy("$SI_SCRIPT", "$SI_DIR/")
 			or &abort("Error copying $SI_SCRIPT!");
-		chmod(0755, "$PKGROOT/MySQL/" . basename("$SI_SCRIPT"));
-		copy("$SI_PARAMS", "$PKGROOT/MySQL/")
+		chmod(0755, "$SI_DIR/" . basename("$SI_SCRIPT"));
+		copy("$SI_PARAMS", "$SI_DIR/")
 			or &abort("Error copying $SI_PARAMS!");
-		chmod(0644, "$PKGROOT/MySQL/" . basename("$SI_PARAMS"));
-		&run_command("chown -R root.wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
+		chmod(0644, "$SI_DIR/" . basename("$SI_PARAMS"));
+		&run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
 		copy("$SI_POST", "$RESOURCE_DIR/postinstall")
 			or &abort("Error copying $SI_POST!");
 		chmod(0644, "$RESOURCE_DIR/postinstall");

Build-tools/Do-rpm

@@ -22,6 +22,7 @@ use Getopt::Long;
 Getopt::Long::Configure ("bundling");
 use Sys::Hostname;
 
+$opt_nobuild = undef;
 $opt_cc= undef;
 $opt_cflags= undef;
 $opt_clean= undef;
@@ -48,6 +49,7 @@ GetOptions(
 	"help|h",
 	"log|l:s",
 	"mail|m=s",
+        "nobuild",
 	"verbose|v",
 ) || &print_help;
 
@@ -79,7 +81,10 @@ foreach (@spec)
 	if (m/^%define\s*mysql_version\s*(.*)/)
 	{
 		$VERSION= $1;
+                $VERSION_SRPM=$VERSION;
 		($MAJOR, $MINOR, $RELEASE)= split(/\./,$VERSION);
+                $VERSION_SRPM= $MAJOR . '.' . $MINOR . '.' . $RELEASE; 
+                $VERSION_SRPM =~ s/\-\w+$//;
 		($RELEASE, $SUFFIX)= split(/\-/,$RELEASE);
 		$SUFFIX= "-" . $SUFFIX if ($SUFFIX);
 	}
@@ -115,10 +120,12 @@ if (defined $opt_log)
 if (-x "/usr/bin/rpmbuild")
 {
 	$RPM= "/usr/bin/rpmbuild";
+	$RMSOURCE= "--rmsource --rmspec";
 }
 else
 {
 	$RPM= "/bin/rpm";
+	$RMSOURCE= "--rmspec";
 }
 
 if ($RPM)
@@ -141,76 +148,67 @@ chomp($SRCRPMDIR= `$RPM --eval "%{_srcrpmdir}" 2> /dev/null`);
 
 $SOURCEFILE= glob "mysql*-$VERSION.tar.gz";
 
-&logger("Starting RPM build of MySQL-$VERSION on $HOST");
+unless($opt_nobuild) {
 
-foreach $file ($SOURCEFILE, $SPECFILE)
-{
-	&abort("Unable to find $file!") unless (-f "$file");
-}
+  &logger("Starting RPM build of MySQL-$VERSION on $HOST");
+
+  foreach $file ($SOURCEFILE, $SPECFILE)
+  {
+    &abort("Unable to find $file!") unless (-f "$file");
+  }
 
 #
 # Install source and spec file
 #
-&logger("Copying SOURCE and SPEC file to build directories.");
-unless ($opt_dry_run)
-{
-	copy($SOURCEFILE, $SOURCEDIR)
-	or &abort("Unable to copy $SOURCEFILE to $SOURCEDIR!");
-	copy($SPECFILE, $SPECDIR)
-	or &abort("Unable to copy $SPECFILE to $SPECDIR!");
-}
+  &logger("Copying SOURCE and SPEC file to build directories.");
+  unless ($opt_dry_run)
+  {
+    copy($SOURCEFILE, $SOURCEDIR)
+      or &abort("Unable to copy $SOURCEFILE to $SOURCEDIR!");
+    copy($SPECFILE, $SPECDIR)
+      or &abort("Unable to copy $SPECFILE to $SPECDIR!");
+  }
 
 #
 # Set environment variables - these are being used in the
 # official MySQL RPM spec file
 #
-&logger("Setting special build environment variables")
-if ($opt_cc) or ($opt_cflags) or ($opt_cxxflags) or ($opt_cxx);
-$ENV{MYSQL_BUILD_CC}=$opt_cc if ($opt_cc);
-$ENV{MYSQL_BUILD_CFLAGS}=$opt_cflags if ($opt_cflags);
-$ENV{MYSQL_BUILD_CXXFLAGS}=$opt_cxxflags if ($opt_cxxflags);
-$ENV{MYSQL_BUILD_CXX}=$opt_cxx if ($opt_cxx);
+  &logger("Setting special build environment variables")
+    if ($opt_cc) or ($opt_cflags) or ($opt_cxxflags) or ($opt_cxx);
+  $ENV{MYSQL_BUILD_CC}=$opt_cc if ($opt_cc);
+  $ENV{MYSQL_BUILD_CFLAGS}=$opt_cflags if ($opt_cflags);
+  $ENV{MYSQL_BUILD_CXXFLAGS}=$opt_cxxflags if ($opt_cxxflags);
+  $ENV{MYSQL_BUILD_CXX}=$opt_cxx if ($opt_cxx);
 
 #
 # Build the RPMs
 #
-$command= "$RPM";
-$command.= " -v" if ($opt_verbose);
-$command.= " -ba";
-$command.= " --clean" if $opt_clean;
-$command.= " $SPECDIR/";
-$command.= basename($SPECFILE);
-&logger("Building RPM.");
-&run_command($command, "Error while building the RPMs!"); 
+  $command= "$RPM";
+  $command.= " -v" if ($opt_verbose);
+  $command.= " -ba";
+  $command.= " --clean $RMSOURCE" if $opt_clean;
+  $command.= " $SPECDIR/";
+  $command.= basename($SPECFILE);
+  &logger("Building RPM.");
+  &run_command($command, "Error while building the RPMs!"); 
+}
 
 #
 # Move the resulting RPMs into the pwd
 #
 $command= "mv";
 $command.= " -v " if ($opt_verbose);
-$command.= "$SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
+$command.= " $SRCRPMDIR/MySQL*$VERSION_SRPM*.src.rpm $PWD";
 &logger("Moving source RPM to current dir.");
 &run_command($command, "Error moving source RPM!");
 
 $command= "mv";
 $command.= " -v " if ($opt_verbose);
-$command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION*.$RPMARCH.rpm $PWD";
+# $command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION*.$RPMARCH.rpm $PWD";
+$command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION_SRPM*.$RPMARCH.rpm $PWD";
 &logger("Moving binary RPMs to current dir.");
 &run_command($command, "Error moving binary RPMs!");
 
-#
-# Clean up
-#
-if ($opt_clean)
-{
-	&logger("Removing spec file and source package");
-	unless ($opt_dry_run)
-	{
-		unlink("$SPECDIR/" . basename($SPECFILE));
-		unlink("$SOURCEDIR/$SOURCEFILE");
-	}
-}
-
 &logger("SUCCESS: RPM files successfully created.") unless ($opt_dry_run);
 exit 0;
 

Build-tools/Do-win-build

+#!/usr/bin/perl -w
+
+use Getopt::Long;
+
+$opt_help=0;
+$opt_tarball=$opt_builddir=$opt_suffix="";
+
+GetOptions(
+    "help",
+    "tarball=s",
+    "builddir=s",
+    "suffix=s"
+) || print_help();
+
+print_help() if ($opt_help);
+
+chomp($MSDEV=`which msdev`);
+
+if (!$opt_builddir) {
+  $opt_builddir = "/cygdrive/c/mysql-win-build";
+}
+
+$opt_tarball =~ /(mysql[^\/]*)-win-src\.tar/;
+$mysqlver=$1;
+$basedir = "$opt_builddir/$mysqlver";
+$scriptdir = `pwd`;
+
+# Make sure build dir exists
+mkdir($opt_builddir);
+# Clean out any previous build
+system("rm -rf $basedir");
+
+# Unpack in the script directory
+system("tar -zxvf $opt_tarball");
+# Move to the build directory
+system("mv $mysqlver $opt_builddir");
+
+if (!chdir($basedir))
+{
+  print "Do-win-build error: Could not change to $basedir";
+  exit 1;
+}
+
+# Check whether this is a classic edition build
+if ($opt_suffix =~ /-classic/)
+{
+  # Blank out ha_innodb.cpp
+  chmod 0644, 'sql/ha_innodb.cpp';
+  open(OUT, '>', 'sql/ha_innodb.cpp');
+  close(OUT);
+
+  # Remove HAVE_INNOBASE_DB from the requisite project files
+  for $dspfile ('libmysqld/libmysqld.dsp', 'mysqldemb/mysqldemb.dsp', 'mysqlserver/mysqlserver.dsp', 'sql/mysqld.dsp', 'sql/mysqldmax.dsp')
+  {
+    open(IN, '<', $dspfile);
+    open(OUT, '>', "$dspfile.tmp");
+    while (readline IN)
+    {
+      s/\D \"HAVE_INNOBASE_DB\" //g;
+      print OUT $_;
+    }
+    close(IN);
+    close(OUT);
+    unlink $dspfile;
+    rename "$dspfile.tmp", $dspfile;
+  }
+}
+
+# Perform compilation
+system("\"$MSDEV\" mysql.dsw /MAKE \"ALL\" /OUT $mysqlver-build.log");
+
+# Package binary
+system("./scripts/make_win_binary_distribution --suffix=$opt_suffix");
+
+# Copy log back to script directory
+system("cp $mysqlver$suffix-build.log $scriptdir");
+
+# Move binary package to script directory
+system("mv *.zip $scriptdir");
+
+#
+# Print a help text message
+#
+sub print_help
+{
+	print <<EOF;
+Usage: Do-compile-win [options] source-tarball
+
+Unpacks a Windows source distribution on the local machine and
+compiles it using VC++ 6.0.
+
+This script is intended for Cygwin Perl. You must have a working
+MSDEV.EXE in your path for compilation, as well as the following:
+
+sed
+tar (GNU tar)
+which
+
+
+Options:
+
+--help
+Print this text.
+
+--builddir=<dir>
+Set the Cygwin path to build under; the tarball will actually
+be moved to <builddir>/mysql-<version>/tarball and extracted under
+<builddir>/mysql-<version>/build.
+Default: /cygdrive/c/mysql-win-build
+
+--suffix=<suffix>
+If specified, the resulting binary will have the specified suffix
+in its name. If the suffix is "-classic", the project files will
+be stripped of all occurrences of HAVE_INNOBASE_DB and
+ha_innodb.cpp will be blanked out, to create classic edition
+server binaries.
+
+--tarball=<file>
+Windows source tarball to use for this build. Must be of the form
+mysql[com]-x.x.x-win-src.tar.gz (REQUIRED)
+
+EOF
+	exit 1;
+}

Build-tools/logger.pm

@@ -5,7 +5,10 @@
 #
 sub logger
 {
-	my $message=$_[0];
+	my $message= $_[0];
+	my $cmnd= $_[1];
+
+	print $message . "\n" if !$opt_quiet && !$opt_verbose && !$cmnd;
 	print timestamp() . " " . $message . "\n" if $opt_verbose;
 	if (defined $opt_log && !$opt_dry_run)
 	{
@@ -30,9 +33,12 @@ sub run_command
 	}
 	else
 	{
-		&logger($command);
-		$command.= " >> $LOGFILE 2>&1" if defined $opt_log;
-		$command.= " > /dev/null" if (!$opt_verbose && !$opt_log);
+	        &logger($command, 1);
+
+		$command.= ';' unless ($command =~ m/^.*;$/);
+
+		$command =~ s/;/ >> $LOGFILE 2>&1;/g if defined $opt_log;
+		$command =~ s/;/ > \/dev\/null;/g if (!$opt_verbose && !$opt_log);
 		system($command) == 0 or &abort("$errormsg\n");
 	}
 }
@@ -47,6 +53,7 @@ sub abort
 {
 	my $message= $_[0];
 	my $messagefile;
+	my $subject= "Bootstrap of $REPO failed" if $opt_mail;
 	$message= "ERROR: " . $message;
 	&logger($message);
 

Build-tools/my_md5sum

+#!/usr/bin/perl
+#
+# my_md5sum
+#
+# Script to clone the 'md5sum' command found on modern systems, since that
+# command is not always found on all systems.
+#
+# Use the "--help" option for more info!
+#
+# Written by Matt Wagner <matt@mysql.com>
+#
+use strict;
+
+#
+# Use local perl libraries first. 'unshift' adds to the front of @INC
+# The local perl library dir hidden is $HOME/.perllibs on each build host
+#
+BEGIN
+{
+        my $homedir= $ENV{HOME};
+        unshift (@INC, "$homedir/.perllibs");
+}
+
+use Digest::MD5;
+use Getopt::Long;
+
+my $VER= "1.3";
+my $EXIT= 0;
+
+#
+# Strip the leading path info off the program name ($0). We want 'my_md5sum'
+# not './my_md5sum'.
+#
+$0=~ s/^.*\/(.+)$/$1/;
+
+my ($opt_check, $opt_help)= undef;
+
+GetOptions(
+	"check|c" => \$opt_check,
+	"help|h" => \$opt_help,
+	) || usage(); 
+
+#
+# Put all the [file1 file2 file3 ...]'s into an array
+#
+my @files = @ARGV;
+
+#
+# Give the "--help" text if:
+#  - "--help|-h" was specified
+#  - The number of files given as arguments is nil
+#  - The "--check|-c" option is used with more than one [file] argument
+#
+usage() if $opt_help || $#files == -1 || ($opt_check && $#files > 0);
+
+# If "--check|-c", then go into checking
+if ($opt_check)
+{
+	open (CHECKFILE, $files[0]) or die "$files[0]: $!";
+
+	while (<CHECKFILE>)
+	{
+		#
+		# Goto the next line in the file if it does not match a typical
+		# digest line like:
+		#
+		# f1007efa2c72daa693981ec764cdeaca  Bootstrap
+		#
+		next if $_!~ m/^([a-z0-9]{32})\s+(.+)$/;
+
+		# Collect the trappings from the above regex
+		my $checksum= $1;
+		my $checkfile= $2;
+
+		# Generate a fresh MD5 for the file in question
+		my $digest= &mkmd5($checkfile);
+
+		# Check the fresh MD5 against what is recorded in the file
+		# Print an error message if they don't match, else print OK
+		print "$checkfile: FAILED\n" if $digest ne $checksum;
+		print "$checkfile: OK\n" if $digest eq $checksum;
+
+                # Set the exit() status to non-zero if FAILED
+                $EXIT= 1 if $digest ne $checksum;
+	}
+}
+# Else generate the MD5 digest to STDOUT
+else
+{
+	foreach my $file (@files)
+	{
+		my $digest= &mkmd5($file);
+
+		print "$digest  $file\n";
+	}
+}
+
+exit($EXIT);
+
+
+#
+# This routine generates the MD5 digest of a file
+#
+sub mkmd5
+{
+	my $file= shift;
+
+	open (FILE, $file) or die "$file: $!";
+	binmode(FILE);
+
+	my $digest= Digest::MD5->new->addfile(*FILE)->hexdigest;
+
+	close FILE;
+
+	return $digest;
+}
+
+#
+# Print the help text
+#
+sub usage
+{
+	print <<EOF;
+
+$0 version $VER by Matt Wagner <matt\@mysql.com>
+
+Usage:
+$0 [-c [file]] |  [file1...]
+Generates or checks MD5 message digests.
+
+Options:
+-c, --check	Check message digests (default is generate)
+-h, --help	Display this text and exit
+
+The input for -c should be the list of message digests and file names that is
+printed on STDOUT by this program when it generates digests.
+
+EOF
+
+	exit(0);
+}

Build-tools/mysql-copyright

@@ -12,15 +12,17 @@ use Getopt::Long;
 
 $opt_help    = 0;
 $opt_version = 0;
+$opt_verbose = 0;
 $opt_target  = "mysql-copyright-target-";
 $opt_target .= `date +%d%m%y-%H%M%S`;
 chop $opt_target;
 
-GetOptions("help","version","target=s") || error();
+GetOptions("help","version","target=s", "verbose") || error();
 
 # fix the directory prefix for target dir
 
 $WD= cwd();
+my $win_flag = 0;
 $opt_target= $WD . '/' . $opt_target;
 
 &main();
@@ -50,6 +52,7 @@ sub main
   for ($i=0; $ARGV[$i]; $i++)
   {
     my $distfile= $ARGV[$i];
+    $win_flag = ($distfile =~ /win-src/) ? 1 : 0;
     my $dir;
 
     $dir= "mysql-copyright-";    
@@ -66,20 +69,19 @@ sub main
     }
     # if the distfile is mysql-3.22.22-alpha.tar.gz, then
     # distname is 'mysql-3.22.22-alpha' and suffix '.tar.gz'
-    if ($distfile =~ m/^($REG_BASENAME)([\-\_])
-	($REG_VERSION){1}([\.\-\+])
-	(.*)?$/xo) 
+    if ($distfile =~
+      m/^($REG_BASENAME)([\-\_])($REG_VERSION){1}([\.\-\+]\w+\-\w+)?[\.\-\+](.*)?$/xo) 
     {
       $distname= $1.$2.$3;
-      $suffix= $5.$6;
+      $suffix= $5;
+      $fileext = $6;
       $newdistname= $1."com".$2.$3;
+      $newdistname .= $suffix if $win_flag;
     }
     # find out the extract path (should be same as distname!)
     chomp($destdir= `tar ztf ../$distfile | head -1`);
     # remove slash from the end
     $destdir= substr($destdir, 0, -1);
-		print "destdir: $destdir\n";
-		print "distname: $distname\n";
     
     if ("$destdir" ne "$distname")
     {
@@ -100,41 +102,108 @@ sub main
     # exist in the new mysql distributions, but let's be sure..
     unlink("$destdir/PUBLIC", "$destdir/README");
     copy("$WD/Docs/MySQLEULA.txt", "$destdir");
-    
-    # remove readline subdir
-    `rm -rf $destdir/cmd-line-utils/readline`;
+
+    # remove readline, bdb subdirs and update 'configure'
+    my @extra_fat= ('bdb', 'cmd-line-utils/readline');
+
+    foreach my $fat (@extra_fat)
+    {
+        &trim_the_fat($fat);
+    }
 
     # fix file copyrights
     &fix_usage_copyright();
     &add_copyright();
     
     # rename the directory with new distribution name
+    chdir("$WD/$dir");
+    print "renaming $destdir $newdistname\n" if $opt_verbose; 
     rename($destdir, $newdistname);
     
     # tar the new distribution
-    `tar cz -f $opt_target/$newdistname.tar.gz *`;
+    `tar cz -f $WD/$newdistname.tar.gz $newdistname`;
     $pec= $? >> 8;
     abort($dir, "Making new tar archive failed!\n") if ($pec);
   
     # remove temporary directory
-    chdir "..";
-    `rm -rf $dir/`;
+    chdir($WD) or print "$! Unable to move up one dir\n";
+    `cd $WD`;
+    my $cwd = getcwd();
+    print "current dir is $cwd\n" if $opt_verbose ;
+    if (-e $dir) {
+      print "Trying to delete $dir\n" if $opt_verbose;
+      if ( system("rm -rf $dir")){ 
+        print "$! Unable to delete $dir!\n";
+      }
+    }
   }
   exit(0);
 }  
 
+####
+#### This function will remove unwanted parts of a src tree for the mysqlcom
+#### distributions.
+####
+sub trim_the_fat
+{
+        my $the_fat= shift;
+        my $cwd= getcwd();
+
+        system("rm -rf $destdir/${the_fat}");
+        if ($win_flag)
+        {
+                chdir("$destdir") or die "Unable to change directory to $destdir!: $!\n";
+        }
+        else
+        {
+                chdir("$destdir");
+                unlink ("configure") or die "Can't delete $destdir/configure: $!\n";
+                open(CONFIGURE,"<configure.in") or die "Unable to open configure.in for read: $!\n";
+                undef $/;
+                my $configure= <CONFIGURE>;
+                close(CONFIGURE);
+
+                #
+                # If $the_fat Makefile line closes the parenthesis, then
+                # replace that line with just the closing parenthesis.
+                #
+                if ($configure=~ m|${the_fat}/Makefile\)\n?|)
+                {
+                        $configure=~ s|${the_fat}/Makefile(\)\n?)|$1|;
+                }
+                #
+                # Else just delete the line
+                #
+                else
+                {
+                        $configure=~ s|${the_fat}/Makefile dnl\n?||;
+                }
+
+                open(CONFIGURE,">configure.in") or die "Unable to open configure.in for write: $!\n";
+                print CONFIGURE $configure;
+                close(CONFIGURE);
+                `autoconf`;
+                die "'./configure' was not produced!" unless (-f "configure");
+                chdir("$cwd");
+        }
+}
+
+
 ####
 #### mysqld and MySQL client programs have a usage printed with --help.
 #### This usage includes a copyright, which needs to be modified
 ####
-
 sub fix_usage_copyright
 {
-  my @Cfiles = `find . -type f -name \"*.c*\"`;
-  foreach my $Cfile (@Cfiles)
+  my $findlist = `find . -type f -name \"*.c*\"`;
+  my @files = split("\n", $findlist);
+  my $cwd = getcwd();
+
+  foreach my $file (@files)
   {
-    chop $Cfile;
-    `replace "This is free software," "This is commercial software," "and you are welcome to modify and redistribute it under the GPL license" "please see the file MySQLEULA.txt for details" -- $Cfile`;
+    next if ! -f $file;
+    print "processing file $file in cwd $cwd\n" if $opt_verbose;
+    `replace "This is free software," "This is commercial software," "and you are welcome to modify and redistribute it under the GPL license" "please see the file MySQLEULA.txt for details" -- "$file"` ;
   }
 }
 
@@ -144,11 +213,16 @@ sub fix_usage_copyright
 
 sub add_copyright
 {
-  my @files = `find . -type f -name "*"`;
+  my $findlist = `find . -type f -name "*"`;
+  my @files = split("\n", $findlist);
+  my $cwd = getcwd();
+
   foreach my $file (@files)
   {
-    chop $file;
-    `$WD/Build-tools/mysql-copyright-2 $file`;
+    next if ! -f $file;
+    next if -B $file;
+    print "processing file $file in cwd $cwd\n" if $opt_verbose;
+    `$WD/Build-tools/mysql-copyright-2 "$file"`;
   }
 }
 

Build-tools/mysql-copyright-2

@@ -89,11 +89,12 @@ sub add_copyright
   elsif ($ARGV =~ /\.c$/ ||
 	 $ARGV =~ /\.cc$/ ||
 	 $ARGV =~ /\.h$/ ||
+	 $ARGV =~ /\.cpp$/ ||
 	 $ARGV =~ /\.yy$/)
   {
     $start_copyright="/* ";
     $line_copyright= "   ";
-    $end_copyright=  " */";
+    $end_copyright=  "*/";
   }
 	elsif ($ARGV =~ /-x86\.s$/)
 	{

Docs/mysqld_error.txt

@@ -142,11 +142,11 @@ character-set=latin1
 #define ER_MULTIPLE_PRI_KEY 1068
 "Multiple primary key defined",
 #define ER_TOO_MANY_KEYS 1069
-"Too many keys specified. Max %d keys allowed",
+"Too many keys specified; max %d keys allowed",
 #define ER_TOO_MANY_KEY_PARTS 1070
 "Too many key parts specified. Max %d parts allowed",
 #define ER_TOO_LONG_KEY 1071
-"Specified key was too long. Max key length is %d",
+"Specified key was too long; max key length is %d bytes",
 #define ER_KEY_COLUMN_DOES_NOT_EXITS 1072
 "Key column '%-.64s' doesn't exist in table",
 #define ER_BLOB_USED_AS_KEY 1073
@@ -406,7 +406,7 @@ character-set=latin1
 #define ER_BAD_SLAVE 1200
 "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
 #define ER_MASTER_INFO 1201
-"Could not initialize master info structure, check permisions on master.info",
+"Could not initialize master info structure, more error messages can be found in the MySQL error log",
 #define ER_SLAVE_THREAD 1202
 "Could not create slave thread, check system resources",
 #define ER_TOO_MANY_USER_CONNECTIONS 1203
@@ -460,7 +460,7 @@ character-set=latin1
 #define ER_SPECIFIC_ACCESS_DENIED_ERROR 1227
 "Access denied. You need the %-.128s privilege for this operation",
 #define ER_LOCAL_VARIABLE 1228
-"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL",
+"Variable '%-.64s' is a SESSION variable and can't be used with SET GLOBAL",
 #define ER_GLOBAL_VARIABLE 1229
 "Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL",
 #define ER_NO_DEFAULT 1230
@@ -479,95 +479,119 @@ character-set=latin1
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 #define ER_SLAVE_IGNORED_TABLE 1237
 "Slave SQL thread ignored the query because of replicate-*-table rules",
-#define ER_WRONG_FK_DEF 1238
+#define ER_INCORRECT_GLOBAL_LOCAL_VAR 1238
+"Variable '%-.64s' is a %s variable",
+#define ER_WRONG_FK_DEF 1239
 "Wrong foreign key definition for '%-.64s': %s",
-#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1239
+#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1240
 "Key reference and table reference doesn't match",
-#define ER_OPERAND_COLUMNS 1240
+#define ER_OPERAND_COLUMNS 1241
 "Operand should contain %d column(s)",
-#define ER_SUBQUERY_NO_1_ROW 1241
+#define ER_SUBQUERY_NO_1_ROW 1242
 "Subquery returns more than 1 row",
-#define ER_UNKNOWN_STMT_HANDLER 1242
+#define ER_UNKNOWN_STMT_HANDLER 1243
 "Unknown prepared statement handler (%ld) given to %s",
-#define ER_CORRUPT_HELP_DB 1243
+#define ER_CORRUPT_HELP_DB 1244
 "Help database is corrupt or does not exist",
-#define ER_CYCLIC_REFERENCE 1244
+#define ER_CYCLIC_REFERENCE 1245
 "Cyclic reference on subqueries",
-#define ER_AUTO_CONVERT 1245
+#define ER_AUTO_CONVERT 1246
 "Converting column '%s' from %s to %s",
-#define ER_ILLEGAL_REFERENCE 1246
+#define ER_ILLEGAL_REFERENCE 1247
 "Reference '%-.64s' not supported (%s)",
-#define ER_DERIVED_MUST_HAVE_ALIAS 1247
+#define ER_DERIVED_MUST_HAVE_ALIAS 1248
 "Every derived table must have it's own alias",
-#define ER_SELECT_REDUCED 1248
+#define ER_SELECT_REDUCED 1249
 "Select %u was reduced during optimisation",
-#define ER_TABLENAME_NOT_ALLOWED_HERE 1249
+#define ER_TABLENAME_NOT_ALLOWED_HERE 1250
 "Table '%-.64s' from one of SELECT's can not be used  in %-.32s",
-#define ER_NOT_SUPPORTED_AUTH_MODE 1250
+#define ER_NOT_SUPPORTED_AUTH_MODE 1251
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-#define ER_SPATIAL_CANT_HAVE_NULL 1251
+#define ER_SPATIAL_CANT_HAVE_NULL 1252
 "All parts of a SPATIAL KEY must be NOT NULL",
-#define ER_COLLATION_CHARSET_MISMATCH 1252
+#define ER_COLLATION_CHARSET_MISMATCH 1253
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
-#define ER_SLAVE_WAS_RUNNING 1253
+#define ER_SLAVE_WAS_RUNNING 1254
 "Slave is already running",
-#define ER_SLAVE_WAS_NOT_RUNNING 1254
+#define ER_SLAVE_WAS_NOT_RUNNING 1255
 "Slave has already been stopped",
-#define ER_TOO_BIG_FOR_UNCOMPRESS 1255
+#define ER_TOO_BIG_FOR_UNCOMPRESS 1256
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-#define ER_ZLIB_Z_MEM_ERROR 1256
-"ZLIB: Not enough memory available for zlib",
-#define ER_ZLIB_Z_BUF_ERROR 1257
-"ZLIB: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
-#define ER_ZLIB_Z_DATA_ERROR 1258
-"ZLIB: Input data was corrupted for zlib",
-#define ER_CUT_VALUE_GROUP_CONCAT 1259
+#define ER_ZLIB_Z_MEM_ERROR 1257
+"ZLIB: Not enough memory",
+#define ER_ZLIB_Z_BUF_ERROR 1258
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
+#define ER_ZLIB_Z_DATA_ERROR 1259
+"ZLIB: Input data corrupted",
+#define ER_CUT_VALUE_GROUP_CONCAT 1260
 "%d line(s) was(were) cut by group_concat()",
-#define ER_WARN_TOO_FEW_RECORDS 1260
-"Record count is fewer than the column count at row %ld";
-#define ER_WARN_TOO_MANY_RECORDS 1261
-"Record count is more than the column count at row %ld";
-#define ER_WARN_NULL_TO_NOTNULL 1262
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
-#define ER_WARN_DATA_OUT_OF_RANGE 1263
-"Data truncated, out of range for column '%s' at row %ld";
-#define ER_WARN_DATA_TRUNCATED 1264
+#define ER_WARN_TOO_FEW_RECORDS 1261
+"Row %ld doesn't contain data for all columns",
+#define ER_WARN_TOO_MANY_RECORDS 1262
+"Row %ld was truncated; It contained more data than there were input columns",
+#define ER_WARN_NULL_TO_NOTNULL 1263
+"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+#define ER_WARN_DATA_OUT_OF_RANGE 1264
+"Data truncated, out of range for column '%s' at row %ld",
+#define ER_WARN_DATA_TRUNCATED 1265
 "Data truncated for column '%s' at row %ld",
-#define ER_WARN_USING_OTHER_HANDLER 1265
+#define ER_WARN_USING_OTHER_HANDLER 1266
 "Using storage engine %s for table '%s'",
-#define ER_CANT_AGGREGATE_2COLLATIONS 1266
+#define ER_CANT_AGGREGATE_2COLLATIONS 1267
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-#define ER_DROP_USER 1267
+#define ER_DROP_USER 1268
 "Can't drop one or more of the requested users",
-#define ER_REVOKE_GRANTS 1268
+#define ER_REVOKE_GRANTS 1269
 "Can't revoke all privileges, grant for one or more of the requested users",
-#define ER_CANT_AGGREGATE_3COLLATIONS 1269
+#define ER_CANT_AGGREGATE_3COLLATIONS 1270
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
-#define ER_CANT_AGGREGATE_NCOLLATIONS 1270
+#define ER_CANT_AGGREGATE_NCOLLATIONS 1271
 "Illegal mix of collations for operation '%s'",
-#define ER_VARIABLE_IS_NOT_STRUCT 1271
+#define ER_VARIABLE_IS_NOT_STRUCT 1272
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
-#define ER_UNKNOWN_COLLATION 1272
+#define ER_UNKNOWN_COLLATION 1273
 "Unknown collation: '%-.64s'",
-#define ER_SLAVE_IGNORED_SSL_PARAMS 1273
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
-#define ER_SERVER_IS_IN_SECURE_AUTH_MODE 1274
-"Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
-#define ER_WARN_FIELD_RESOLVED 1275
+#define ER_SLAVE_IGNORED_SSL_PARAMS 1274
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
+#define ER_SERVER_IS_IN_SECURE_AUTH_MODE 1275
+"Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
+#define ER_WARN_FIELD_RESOLVED 1276
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
-#define ER_BAD_SLAVE_UNTIL_COND 1276
+#define ER_BAD_SLAVE_UNTIL_COND 1277
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
-#define ER_MISSING_SKIP_SLAVE 1277
+#define ER_MISSING_SKIP_SLAVE 1278
 "It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL. Otherwise you will get problems if you get an unexpected slave's mysqld restart",
-#define ER_UNTIL_COND_IGNORED 1278
+#define ER_UNTIL_COND_IGNORED 1279
 "SQL thread is not to be started so UNTIL options are ignored",
-#define ER_WRONG_NAME_FOR_INDEX 1279
+#define ER_WRONG_NAME_FOR_INDEX 1280
 "Incorrect index name '%-.100s'",
-#define ER_WRONG_NAME_FOR_CATALOG 1280
+#define ER_WRONG_NAME_FOR_CATALOG 1281
 "Incorrect catalog name '%-.100s'",
-#define ER_WARN_QC_RESIZE 1281
+#define ER_WARN_QC_RESIZE 1282
 "Query cache failed to set size %lu, new query cache size is %lu",
-#define ER_BAD_FT_COLUMN 1282
+#define ER_BAD_FT_COLUMN 1283
 "Column '%-.64s' cannot be part of FULLTEXT index",
-#define ER_UNKNOWN_KEY_CACHE 1283
+#define ER_UNKNOWN_KEY_CACHE 1284
 "Unknown key cache '%-.100s'",
+#define ER_WARN_HOSTNAME_WONT_WORK 1285
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
+#define ER_UNKNOWN_STORAGE_ENGINE 1286
+"Unknown table engine '%s'",
+#define ER_WARN_DEPRECATED_SYNTAX 1287
+"'%s' is deprecated, use '%s' instead",
+#define ER_NON_UPDATABLE_TABLE 1288
+"The target table %-.100s of the %s is not updatable",
+#define ER_FEATURE_DISABLED 1289
+"The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
+#define ER_OPTION_PREVENTS_STATEMENT 1290
+"The MySQL server is running with the %s option so it cannot execute this statement",
+#define ER_DUPLICATED_VALUE_IN_TYPE 1291
+"Column '%-.100s' has duplicated value '%-.64s' in %s"
+#define ER_TRUNCATED_WRONG_VALUE 1292
+"Truncated wrong %-.32s value: '%-.128s'"
+#define ER_TOO_MUCH_AUTO_TIMESTAMP_COLS 1293
+"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+#define ER_INVALID_ON_UPDATE 1294
+"Invalid ON UPDATE clause for '%-.64s' field",
+#define ER_UNSUPPORTED_PS 1295
+"This command is not supported in the prepared statement protocol yet",

Docs/section.Testimonials.texi

-@c FIX AGL 20011108 Extracted from manual.texi.
-@c Should only be on website with new submits by webform.
-
-
-@node MySQL Testimonials, Contrib, Users, Top
-@appendix MySQL Testimonials
-
-@cindex MySQL Testimonials
-
-The section 'MySQL Users' contains a lot of different links to
-MySQL users but doesn't provide that much information about how
-they are using MySQL.  @xref{Users}. This section gives you an idea
-of how other MySQL users are using MySQL to solve their problems.
-
-Please note that all new stories are added on the MySQL website,
-@uref{http://www.mysql.com/}.
-Do let us know about @emph{your} success story too!
-
-@itemize @bullet
-@item 
-@strong{Peter Zaitsev of Spylog.ru} writes:
-I think you might be interested in my database size.  The whole database
-is currently on 15 servers and I think it's about 60.000 of tables
-containing about 5.000.000.000 of rows.  My mostly loaded server
-currently holds about 10.000 of tables with 1.000.000.000 of rows in it.
-Hugest tables have about 50.000.000 of rows, and this value will raise
-as soon as I'll move to 2.4 kernel with large files. Currently I have to
-delete much of logs for large sites to hold table sizes in 2Gb.
-
-@item
-

Docs/sp-imp-spec.txt

@@ -135,7 +135,7 @@
         while x > 0 do
           set x = x-1;
           insert into db.tab values (x, s);
-        end while
+        end while;
       end
 
       would generate the following structures:
@@ -1057,9 +1057,9 @@
 
     CREATE TABLE proc (
       db                char(64) binary DEFAULT '' NOT NULL,
-      name              char(64) binary DEFAULT '' NOT NULL,
+      name              char(64) DEFAULT '' NOT NULL,
       type              enum('FUNCTION','PROCEDURE') NOT NULL,
-      specific_name     char(64) binary DEFAULT '' NOT NULL,
+      specific_name     char(64) DEFAULT '' NOT NULL,
       language          enum('SQL') DEFAULT 'SQL' NOT NULL,
       sql_data_access   enum('CONTAINS_SQL') DEFAULT 'CONTAINS_SQL' NOT NULL,
       is_deterministic  enum('YES','NO') DEFAULT 'NO' NOT NULL,

Docs/sp-implemented.txt

-Stored Procedures implemented 2003-12-10:
-
-
-Summary of Not Yet Implemented:
-
-  - SQL statements using table (like SELECT, INSERT, UPDATE etc)
-    in FUNCTIONs
-  - External languages
-  - Access control
-  - Routine characteristics (mostly used for external languages)
-  - SQL-99 COMMIT (related to BEGIN/END)
-  - FOR-loops
-  - CASCADE/RESTRICT for ALTER and DROP
-  - ALTER/DROP METHOD (as it implies User Defined Types)
-  - SIGNAL and RESIGNAL, and UNDO handlers
+Stored Procedures implemented 2004-01-29:
 
 
 Summary of what's implemented:
@@ -26,7 +12,19 @@ Summary of what's implemented:
   - Prepared SP caching
   - CONDITIONs and HANDLERs
   - Simple read-only CURSORs.
-  - SHOW DECLARE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS
+  - SHOW CREATE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS
+
+
+Summary of Not Yet Implemented:
+
+  - SQL statements using tables (like SELECT, INSERT, UPDATE etc) in FUNCTIONs
+  - External languages
+  - Access control
+  - SQL-99 COMMIT (related to BEGIN/END)
+  - FOR-loops
+  - CASCADE/RESTRICT for ALTER and DROP
+  - ALTER/DROP METHOD (as it implies User Defined Types)
+  - SIGNAL and RESIGNAL, and UNDO handlers
 
 
 List of what's implemented:
@@ -50,13 +48,12 @@ List of what's implemented:
     CASCADE/RESTRICT is not implemented.
 
   - CALL name (args)
-    OUT and INOUT parameters are only supported for local variables, and
-    therefore only useful when calling such procedures from within another
-    procedure.
-    Note: For the time being, when a procedure with OUT/INOUT parameter is
-          called, the out values are silently discarded. In the future, this
-	  will either generate an error message, or it might even work to
-	  call all procedures from the top-level.
+    OUT and INOUT parameters are also works for user variables ("global"
+    variables) - i.e., if a procedure is defined as:
+      CREATE PROCEDURE foo(OUT p INT) ...;
+    a call like:
+      CALL foo(@x);
+    will set @x to the output value.
 
   - Function/Procedure body:
     - BEGIN/END
@@ -81,17 +78,17 @@ List of what's implemented:
       is implemented. (Note: This is not SQL-99 feature, but common in other
       databases.)
     - A FUNCTION can have flow control contructs, but must not contain
-      an SQL query, like SELECT, INSERT, UPDATE, etc. The reason is that it's
-      hard to allow this is that a FUNCTION is executed as part of another
-      query (unlike a PROCEDURE, which is called as a statement). The table
-      locking scheme used makes it difficult to allow "subqueries" during
-      FUNCTION invokation.
+      an SQL query/statement, like SELECT, INSERT, UPDATE, etc. The reason
+      is that it's hard to allow this is that a FUNCTION is executed as part
+      of another query (unlike a PROCEDURE, which is called as a statement).
+      The table locking scheme used makes it difficult to allow "subqueries"
+      during FUNCTION invokation.
     - SPs are cached, but with a separate cache for each thread (THD).
       There are still quite a few non-reentrant constructs in the lexical
       context which makes sharing prepared SPs impossible. And, even when
       this is resolved, it's not necessarily the case that it will be faster
       than a cache per thread. A global cache requires locks, which might
-      become a buttleneck. (It would save memory though.)
+      become a bottleneck. (It would save memory though.)
     - CONDITIONs and HANDLERs are implemented, but not the SIGNAL and
       RESIGNAL statements. (It's unclear if these can be implemented.)
       The semantics of CONDITIONs is expanded to allow catching MySQL error
@@ -102,9 +99,13 @@ List of what's implemented:
       (NEXT, PRIOR, etc). Cursors are ASENSITIVE, READ-ONLY, non-SCROLLing.
       (The additional syntax will be added for completeness, but for the
        most part unsupported with the current underlying cursor mechanism.)
+      N.B. The current implementation is temporary and only works within a
+        stored procedure, and may not perform well for very large result sets.
+        A "real" cursor implementation is under development; this will replace
+        the current one when it's finished.
 
   - SHOW procedures and functions
-    SHOW DECLARE PROCEDURE|FUNCTION <name>
+    SHOW CREATE PROCEDURE|FUNCTION <name>
       returns the definition of a routine.
     SHOW PROCEDURE|FUNCTION STATUS [LIKE <pattern>]
       returns characteristics of routines, like the name, type, creator,

Makefile.am

@@ -24,7 +24,7 @@ SUBDIRS =		. include @docs_dirs@ \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack @sql_client_dirs@ \
 			@sql_server_dirs@ scripts man tests SSL\
-			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
+			BUILD netware os2 @libmysqld_dirs@ \
 			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 
 # Relink after clean
@@ -36,7 +36,7 @@ linked_sources = linked_client_sources linked_server_sources \
 CLEANFILES = $(linked_sources)
 
 # This is just so that the linking is done early.
-config.h: $(linked_sources)
+all-local: $(linked_sources)
 
 linked_include_sources:
 	cd include; $(MAKE) link_sources
@@ -71,7 +71,8 @@ linked_server_sources:
 	cd sql; rm -f mini_client_errors.c;\
 		@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c;\
 		rm -f pack.c;@LN_CP_F@ ../sql-common/pack.c pack.c;\
-		rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c
+		rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c;\
+		rm -f my_time.c;@LN_CP_F@ ../sql-common/my_time.c my_time.c
 	echo timestamp > linked_server_sources
 
 # Create permission databases

VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl

-[bin]
-file15=C:\mysql\bin\replace.exe
-file16=C:\mysql\bin\winmysqladmin.cnt
-file0=C:\mysql\bin\isamchk.exe
-file17=C:\mysql\bin\WINMYSQLADMIN.HLP
-file1=C:\mysql\bin\myisamchk.exe
-file18=C:\mysql\bin\comp-err.exe
-file2=C:\mysql\bin\myisamlog.exe
-file19=C:\mysql\bin\my_print_defaults.exe
-file3=C:\mysql\bin\myisampack.exe
-file4=C:\mysql\bin\mysql.exe
-file5=C:\mysql\bin\mysqladmin.exe
-file6=C:\mysql\bin\mysqlbinlog.exe
-file7=C:\mysql\bin\mysqlc.exe
-file8=C:\mysql\bin\mysqlcheck.exe
-file9=C:\mysql\bin\mysqldump.exe
-file20=C:\mysql\bin\winmysqladmin.exe
-file10=C:\mysql\bin\mysqlimport.exe
-fulldirectory=
-file11=C:\mysql\bin\mysqlshow.exe
-file12=C:\mysql\bin\mysqlwatch.exe
-file13=C:\mysql\bin\pack_isam.exe
-file14=C:\mysql\bin\perror.exe
-
-[TopDir]
-SubDir0=bin
-
-[General]
-Type=FILELIST
-Version=1.00.000
-

VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge

-[General]
-Type=REGISTRYDATA
-Version=1.00.000
-