BitKeeper/etc/ignore:
  Added libmysql_r/client_settings.h to the ignore list

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

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

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

into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Null merge.

Fix uninitialized variable causing failures for some interpreted update
operations on gcc 4.2.1.


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix uninitialized variable causing failures for some interpreted update
  operations on gcc 4.2.1.

storage/ndb/test/include/dbutil.hpp:
  Hearder file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.
storage/ndb/test/src/dbutil.cpp:
  Implementation file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.
storage/ndb/test/src/Makefile.am:
  Updated to include dbutil

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


cmd-line-utils/libedit/Makefile.am:
  Auto merged

  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)


cmd-line-utils/libedit/Makefile.am:
  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)

1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".


Makefile.am:
  Add a new "make" target "embedded-test" so that it is easier 
  to test the "embedded server" ("libmyslqd").
  Make it "phony".
  
  Use it via a sub-make within "test-bt" to avoid code duplication.
netware/Makefile.am:
  Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.

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

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


mysql-test/mysql-test-run.pl:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged

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


mysql-test/suite/rpl/r/rpl_bug31076.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
mysql-test/suite/rpl/t/rpl_bug31076.test:
  manual merge

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

  After review changes


BUILD/autorun.sh:
  After review changes

  Removed innobase from compile-dist, and let it use autorun.sh to avoid
  code duplication. Also corrected a problem when searching for one of
  "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)


BUILD/autorun.sh:
  Removed innobase from compile-dist, and let it use autorun.sh to avoid
  code duplication. Also corrected a problem when searching for one of
  "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

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


mysql-test/r/derived.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_cache.cc:
  Null merge of a 5.0 patch, by order of the original author via IRC.

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


configure.in:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged
mysql-test/r/partition.result:
  Ensure test for bug number 27816 is in the merged tree.
mysql-test/t/partition.test:
  Ensure test for bug number 27816 is in the merged tree.

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

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


mysql-test/r/derived.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/type_date.result:
  Null-merge 5.0.50 build clone:
  The test for bug#31221 is already in the receiving tree.
mysql-test/t/type_date.test:
  Null-merge 5.0.50 build clone:
  The test for bug#31221 is already in the receiving tree.

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

into  trift2.:/MySQL/M41/push-4.1

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

  Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
  
Reason for the changes is:
  WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE


mysql-test/suite/funcs_1/datadict/datadict_priv.inc:
  1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR)
  2. Add missing subtest with ALTER DATABASE ... UPGRADE ...
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

   Bug#31408 funcs_1: <engine>_trig_03e test fail
Modification:
   The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
   Therefore after REVOKE TRIGGER privilege the 
   - SHOW TRIGGERS
   - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
   result sets are now empty.


mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated results

mysql-test/suite/ndb/r/ndb_update_no_read.result:
  New BitKeeper file ``mysql-test/suite/ndb/r/ndb_update_no_read.result''
mysql-test/suite/ndb/t/ndb_update_no_read.test:
  New BitKeeper file ``mysql-test/suite/ndb/t/ndb_update_no_read.test''

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

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

BitKeeper/triggers/pre-commit.check-case.pl:
  catch duplicate file names, ignoring capitalisation, mostly to avoid changesets where a deleted file foobar and a deleted file FooBar break a tree on case insensitive file systems

to get rid of a name clash among *deleted* files on case-insignificant file systems.


BitKeeper/deleted/.del-changelog-bleh:
  Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb


storage/ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge.

into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged