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

 - Add output path for slow queries as well 


mysql-test/mysql-test-run.pl:
  Send queries to var/log/$type.log and slow queries to var/log/$type-slow.log

 - Rework the windows implementation in 'create_temp_file' to be
   thread safe by using GetTempFileName instad of fiddling
   with "environ"


mysys/mf_tempfile.c:
  - Update windows implementation  of 'create_temp_file' to use
    GetTempFileName in favor of fiddeling with "environ" in an unsafe way
  - Remove the implementation that is supposed to be used if not
    windows, not mkstemp or tmpnam exists as it not longer compiles it
    can't be used anywhere.
  - Update function comment for 'create_temp_file'
mysys/my_static.c:
  Remove unused variable
mysys/my_static.h:
  Remove unused variable

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  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

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

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


netware/Makefile.am:
  Auto merged

netware/Makefile.am:
  use detected awk variant instead of using awk directly

- Setting up a A->B->A replication causes relay logs being written
  by the master, remove them when test is finished
 


mysql-test/t/rpl_dual_pos_advance.test:
  Cleanup files created by test case in var/run directory

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

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

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

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

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

  Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.


sql/sql_insert.cc:
  Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
mysql-test/t/trigger.test:
  Corrected test case for the bug#27006.
mysql-test/r/trigger.result:
  Corrected test case for the bug#27006.

  Removed accidently added my_winsem.c
make_win_bin_dist:
  Corrected test for relwithdebinfo target
mysql.sln:
  Specify that comp_err depends on zlib


VC++Files/mysys/mysys.vcproj:
  Removed accidently added my_winsem.c
VC++Files/mysql.sln:
  Specify that comp_err depends on zlib
scripts/make_win_bin_dist:
  Corrected test for relwithdebinfo target

into  trift2.:/MySQL/M50/push-5.0


sql/mysql_priv.h:
  Auto merged

  Restore accidently removed line


scripts/make_win_bin_dist:
  Restore accidently removed line

  Major cleanup of old Visual Studio project files, aligning engines etc


VC++Files/bdb/bdb.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysql.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysql_upgrade.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqladmin.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlclient.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqldump.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlimport.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlshow.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqltest.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/comp_err/comp_err.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/dbug/dbug.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/heap/heap.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/innobase/innobase.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysql/libmysql.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqld/libmysqld.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqltest/myTest.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisam/myisam.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisamchk/myisamchk.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisamlog/myisamlog.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisammrg/myisammrg.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisampack/myisampack.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysql.sln:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqldemb/mysqldemb.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlserver/mysqlserver.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysys/mysys.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/perror/perror.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/regex/regex.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/replace/replace.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/sql/gen_lex_hash.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/sql/mysqld.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/strings/strings.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/test1/test1.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/tests/mysql_client_test.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/thr_test/thr_test.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/vio/vio.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/zlib/zlib.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
extra/yassl/taocrypt/taocrypt.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
extra/yassl/yassl.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc
scripts/make_win_bin_dist:
  Major cleanup of old Visual Studio project files, aligning engines etc
server-tools/instance-manager/mysqlmanager.vcproj:
  Major cleanup of old Visual Studio project files, aligning engines etc

into  trift2.:/MySQL/M50/clone-5.0

netware/Makefile.am:
  "libmysql.imp" must survive a "make clean" for the NetWare builds.

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


scripts/make_win_bin_dist:
  Auto merged

  - Support both "release" and "relwithdebinfo" targets
  - Copy ".pdb" and ".pdb" files for the server and instance manager
  - Removed the examples directory, unsupported
  - Handle both old and new builds in the same script, "-debug" and "-nt"
    extensions, directory "data" and "share" in different location


scripts/make_win_bin_dist:
  - Support both "release" and "relwithdebinfo" targets
  - Copy ".pdb" and ".pdb" files for the server and instance manager
  - Removed the examples directory, unsupported
  - Handle both old and new builds in the same script, "-debug" and "-nt"
    extensions, directory "data" and "share" in different location