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


BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged

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

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

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

  Corrected GPL to be version 2 only


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

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
  Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
  Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
  Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
  Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
  Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
  Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
  Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
  Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
  Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
  Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
  Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
  Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
  Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
  Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
  Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Auto merged
mysql-test/install_test_db.sh:
  SCCS merged

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

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

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

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


netware/Makefile.am:
  Auto merged

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

include/my_global.h:
  netware does not have <new>, so we define placement versions of operator new and delete ourselves

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  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/sql_insert.cc:
  Auto merged

  After merge fix.


sql/sql_insert.cc:
  After merge fix.

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_insert.cc:
  Manually merged.

  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

sql/sql_yacc.yy:
  BUG#27270 remove semicolon that is ignored by newer versions of bison but an error with 1.875

  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

sql/item_cmpfunc.cc:
  Ensure both operands of a comparison are cast to "ulonglong", not just one only.
  Without this, some 64-bit big-endian hosts failed test "func_in" when 5.0.38 builds were started.
  
  Patch provided by Timothy.

into  linux.site:/home/omer/source/bld51_0314

include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic


dbug/dbug.c:
  unused variable removed
include/config-win.h:
  SIZEOF_INT
include/my_global.h:
  win64 fix
support-files/Makefile.am:
  automake magic

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


sql/sql_insert.cc:
  Auto merged

into  linux.site:/home/omer/source/bld50_0314

s/ulonglong/key_part_map/, comments


include/heap.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/my_base.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/myisam.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/myisammrg.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/event_db_repository.cc:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/ha_partition.cc:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/ha_partition.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/sql_select.h:
  wl#3700 - post-review fixes:
  remove tab_to_keypart_map()

  Post-merge fix.


sql/sql_insert.cc:
  Post-merge fix.

 - Build sql files for netware from the mysql_system_tables*.sq files
 - Fix comments about mysql_create_system_tables.sh
 - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
 - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files

Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.


BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Delete: netware/init_db.sql
BitKeeper/deleted/.del-test_db.sql:
  Delete: netware/test_db.sql
BitKeeper/etc/ignore:
  Added netware/init_db.sql netware/test_db.sql to the ignore list
mysql-test/install_test_db.sh:
  Use mysql_install_db from install_test_db(which is used by mysql-test-run-shell)
  to install the system tables
mysql-test/mysql-test-run.pl:
  Look for the mysql_system_tables*.sql also in share/mysql
netware/Makefile.am:
  Build netware/init_db.sql and netware/test_db.sql from
  the sources in scripts/msyql_system_tables*.sql
scripts/make_binary_distribution.sh:
  netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
  from the scripts/mysql_system_tables*.sql files
sql/mysql_priv.h:
  Update comment remindging to update the MySQL system table definitions
  when adding a new SQL_MODE
sql/sql_acl.h:
  Update comment reminding to update the MySQL System tables
  when changing the ACL defines

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_insert.cc:
  Manually merged