into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

- make sure all extra flags are reset

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

  fix test prg


ndb/test/ndbapi/testNodeRestart.cpp:
  fix test prg

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  recycle.(none):/src/bug27144/my50-bug27144

- Update test to run properly on Windows.


mysql-test/t/sp-destruct.test:
  Bug#27144 sp-destruct.test is disabled on Windows
  - Enabled test on Windows.
  - Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo) 
  with the mysqltest builtin commands.
  - Replace Windows directory seperator in error ER_NOT_FROM_FILE with
  posix directory seperator for single test/result pair.

into  recycle.(none):/src/bug23736/my50-bug23736

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

    Additional fix for 2-node case


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add error insert ref for errcode = 7181
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
netware/Makefile.am:
  Manual merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged

  make sure master is sendable


ndb/src/mgmsrv/MgmtSrvr.cpp:
  make sure master is sendable

- initialize to NULL, to avoid call of free on uninitialized variable

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50


sql/sql_class.cc:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

- Problem: data separators were copied to a fixed-size buffer
  on the stack; memcpy was used, without bounds checking; a
  server crash could result if long FIELDS ENCLOSED BY, etc.,
  was given
- Fix: write the separators directly, instead of copying to
  a buffer first (in select_export::send_data())


sql/sql_class.cc:
  In select_export::send_data(), write data separators
  directly, instead of copying into a fixed-size memory
  buffer before writing.  This avoids a buffer overflow
  when very large separators are specified.

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

  Corrected GPL to be version 2 only


client/echo.c:
  Corrected GPL to be version 2 only

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged

    Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

  Fix correct min-value for LockPagesInMemory


ndb/src/mgmsrv/ConfigInfo.cpp:
  Fix correct min-value

- Mis-matched SAFEMALLOC defines caused misleading error message.


client/mysqlbinlog.cc:
  Bug#23736 Pointer free error in mysqlbinlog
  - Re-worked the Load_log_processor so that it frees it's resources before 
  my_end is called.  This is necessary because SAFEMALLOC's _my_free calls
  pthread_mutex_lock() using THR_LOCK_malloc which is cleaned up in my_end().
include/my_sys.h:
  Bug#23736 Pointer free error in mysqlbinlog
  - Define DYNAMIC_ARRAY beofore MY_TMPDIR
  - Add DYNAMIC_ARRAY to MY_TMP_DIR
mysys/array.c:
  Bug#23736 Pointer free error in mysqlbinlog
  - SAFEMALLOC should not be unconditionally undef'd.
mysys/mf_tempdir.c:
  Bug#23736 Pointer free error in mysqlbinlog
  - Use struct's DYNAMIC_ARRAY.
  - Use DYNAMIC_ARRAY:delete_dynamic function instead of my_free

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql/slave.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

  No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"


scripts/make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"
VC++Files/libmysqld/libmysqld.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files
VC++Files/mysqldemb/mysqldemb.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files
VC++Files/mysys/mysys.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files
VC++Files/sql/mysqld.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files
VC++Files/vio/vio.vcproj:
  No need to set LICENSE or USE_SYMDIR from project files

- SAFEMALLOC should be defined for each project in debug Windows builds.
SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
due to mixed SAFEMALLOC defines.


innobase/CMakeLists.txt:
  Bug#25765 too many dbg heap assertions on windows
  - Make sure that *_DEBUG defaults are not overwritten.
  - Define SAFEMALLOC and SAFE_MUTEX for debug innodb builds.

mysql-test/r/delayed.result:
  result fixed
mysql-test/r/merge.result:
  result fixed
mysql-test/t/delayed.test:
  moved here from merge.test
mysql-test/t/init_connect.test:
  test fixed as it created users, then stopped without deletion, what caused
  problems in consequent tests
mysql-test/t/merge.test:
  moved to delayed.test
mysql-test/t/mysqlbinlog-cp932.test:
  disabled in embedded server