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

libmysqld/scheduler.cc
libmysqld/sql_connect.cc
  Deleted BitKeeper soft links not needed


BitKeeper/deleted/.del-scheduler.cc:
  Delete: libmysqld/scheduler.cc
BitKeeper/deleted/.del-sql_connect.cc:
  Delete: libmysqld/sql_connect.cc
BitKeeper/deleted/.del-sql_tablespace.cc:
  Delete: libmysqld/sql_tablespace.cc

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


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
BitKeeper/deleted/.del-net_serv.cc~120fb81d7e670308:
  Auto merged
BitKeeper/deleted/.del-pack.c~4754cd15e3058c75:
  Auto merged
BitKeeper/deleted/.del-password.c~9d4b6a4c57887ac7:
  Auto merged
BitKeeper/deleted/.del-sql_state.c~3b39d30b649690f3:
  Auto merged

server-tools/instance-manager/pack.c
server-tools/instance-manager/password.c
server-tools/instance-manager/net_serv.cc
  Deleted BitKeeper soft links not needed


BitKeeper/deleted/.del-net_serv.cc:
  Delete: server-tools/instance-manager/net_serv.cc
BitKeeper/deleted/.del-pack.c:
  Delete: server-tools/instance-manager/pack.c
BitKeeper/deleted/.del-password.c:
  Delete: server-tools/instance-manager/password.c
BitKeeper/deleted/.del-sql_state.c:
  Delete: server-tools/instance-manager/sql_state.c

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


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged

  Deleted BitKeeper soft links not needed


BitKeeper/deleted/.del-client_settings.h:
  Delete: libmysql_r/client_settings.h
BitKeeper/deleted/.del-ha_blackhole.cc:
  Delete: libmysqld/ha_blackhole.cc

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


libmysql/libmysql.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged

  Link with library "udf_example" depends on, needed for nmake
libmysql.c:
  DBUG_ENTER need to be in declaration section


libmysql/libmysql.c:
  DBUG_ENTER need to be in declaration section
sql/CMakeLists.txt:
  Link with library "udf_example" depends on, needed for nmake

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


scripts/mysql_config.sh:
  Auto merged

  Flag changed name in icc 10


scripts/mysql_config.sh:
  Flag changed name in icc 10

     ChangeSet@1.2509, 2007-08-28
     http://lists.mysql.com/commits/33239
  Fixes for the funcs_1 datadict test bugs
  #30418 "datadict" tests (all engines) fail:
         Dependency on the host name for ordering
  #30420 "datadict" tests (all engines) fail:
         Release build has help tables loaded
  #30438 "{memory,myisam,ndb}__datadict" tests fail:
         Use "InnoDB" without checking
  #30440 "datadict" tests (all engines) fail:
         Character sets depend on
                   configuration


mysql-test/suite/funcs_1/README.txt:
  Improved README
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Additions for the NDB variant (currently not in use)
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Write a comment about Bug#30689 into the test protocols.
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Fix for a not reported bug.
  The missing revoke usage and drop user harmed the next test.
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Updated results as far as they could be corrected.
  Attention:
     This test failed even before the current bug fixes.
     The updated expected results are now better than before,
     but they do not prevent that the test fails.
     It looks like one script is "damaged" and treats
     this NDB test different than expected within the
     file with expected results.

   ChangeSet@1.2509, 2007-08-28
   http://lists.mysql.com/commits/33239
Fixes for the funcs_1 datadict test bugs
#30418 "datadict" tests (all engines) fail:
       Dependency on the host name for ordering
#30420 "datadict" tests (all engines) fail:
       Release build has help tables loaded
#30438 "{memory,myisam,ndb}__datadict" tests fail:
       Use "InnoDB" without checking
#30440 "datadict" tests (all engines) fail:
       Character sets depend on
                 configuration
There are more post merge fixes needed.


mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Post merge fix for
     ChangeSet@1.2509, 2007-08-28
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated results
mysql-test/suite/funcs_1/t/ndb__datadict.test:
  Adjusted script

into  four.local.lan:/WORK2/merge/mysql-5.1-build-datadict

It is to be expected that a post merge fix is needed.


mysql-test/suite/funcs_1/README.txt:
  Auto merged
mysql-test/suite/funcs_1/t/innodb__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Manual merge
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Manual merge
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Manual merge
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Manual merge

     Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name
                for ordering
     Bug#30420 "datadict" tests (all engines) fail: Release build has help tables loaded
     Bug#30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking
     Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
Attention: Only the build team can check if Bug#30440 is really fixed.


mysql-test/suite/funcs_1/README.txt:
  Update README
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  1. Exclude the help tables from the INFORMATION_SCHEMA.TABLES
     and the INFORMATION_SCHEMA.STATISTICS selects.
  2. Replace error numbers with error names
  3. Sort some results with mysqltest builtin function
  4. Some other minor changes
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/t/innodb__datadict.test:
  Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/t/memory__datadict.test:
  Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/t/myisam__datadict.test:
  Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/r/datadict_help_tables_build.result:
  File with expected results
mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result:
  File with expected results
mysql-test/suite/funcs_1/t/datadict_help_tables_build.test:
  Additional test checking the information about the help tables within
         INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
  as compensation for the removed checks within datadict_master.inc.
  Variant for use during build tests (non empty help tables)
mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test:
  Additional test checking the information about the help tables within
         INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
  as compensation for the removed checks within datadict_master.inc.
  Variant for use during development tests (empty help tables)

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged

1) "test_db.sql" is a plaintext file, no binary;
2) do not try to strip the binaries, it will not work.


configure.in:
  For NetWare, we cannot strip the binaries, so there is no use in attempting it.
scripts/make_binary_distribution.sh:
  Get rid of a typing error, introduced when a following file name was deleted.

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


sql/field.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged

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


sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
configure.in:
  null-merge

configure.in:
  adjust version number after 5.0.48 clone-off

into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel


client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/status.result:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/status.test:
  Manual resolve with 5.1.
sql/log_event.cc:
  Manual resolve with 5.1.
sql/sql_yacc.yy:
  Manual resolve with 5.1.

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel

into  trift2.:/MySQL/M51/push-5.1


netware/Makefile.am:
  Auto merged

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


netware/Makefile.am:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


netware/BUILD/compile-netware-END:
  Auto merged
netware/Makefile.am:
  Auto merged

into  trift2.:/MySQL/M51/netware2-5.1


netware/BUILD/compile-netware-END:
  Auto merged
netware/Makefile.am:
  Manual merge.

1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.


netware/BUILD/compile-netware-END:
  Ensure the "*.def" files are built for NetWare.
  
  This is a backport of a 5.1 fix which may not be needed in 5.0 but cannot do any harm:
  the general "link_sources" step might fall victim to a cleanup which would be fatal
  just for NetWare, because of problems in the ordering of SUBDIR entries.
netware/Makefile.am:
  1) The scripts "init_db.sql" and "test_db.sql" must be built in the NetWare phase.
  
  2) Use "basename", not sed.

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel


libmysql/libmysql.c:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel

into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release


sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1


sql/ha_ndbcluster.cc:
  Auto merged

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

into  trift2.:/MySQL/M51/push-5.1


mysql-test/suite/ndb/r/ndb_dd_ddl.result:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1