Unable to reproduce failure: some of the 17400 tests pass, other have other failures.
The test in the bug report passes.
Enabling some tests that pass, rebranding others.


mysql-test/t/disabled.def:
  Enabling tests that pass
  Rebranding disabled tests

into  mysql.com:/home/bk/b17400-mysql-5.1-new

into  xgeek.:C:/work/mysql-5.1

  new file

into  mysql.com:/usr/home/bar/mysql-5.1-new.b18171

           rows for SEs using injector):
Table truncation ("DELETE FROM t1" and "TRUNCATE t1") was logged as
a statement even when the storage engine deletes the rows individually
using the injector.


sql/sql_delete.cc:
  Don't log a truncate statement if the storage engine is using the injector.

  removed double entries for sql_yacc.* and added -p MYSQL define to call to bison


win/cmakefiles/sql:
  removed double entries for sql_yacc.* and added -p MYSQL define to call to bison

  Adding test.
item_xmlfunc.cc:
  Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
  Disallowing use of position() and last() without context.


sql/item_xmlfunc.cc:
  Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
  Disallowing use of position() and last() without context.
mysql-test/t/xml.test:
  Adding test.
mysql-test/r/xml.result:
  Adding test.

into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.1


sql/mysqld.cc:
  Auto merged

  Backport option description change from 5.1 to 5.0.


sql/mysqld.cc:
  Backport option description change from 5.1 to 5.0.

into  zim.(none):/home/mikael/bug16370

into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new

(nothing to document, this bug was not released).



mysql-test/t/disabled.def:
  bug is fixed, enabling test case
mysql-test/t/rpl_rbr_to_sbr.test:
  making test portable
mysql-test/r/rpl_rbr_to_sbr.result:
  result update

into  zim.(none):/home/mikael/bug16370


sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  zim.(none):/home/mikael/bug16370


sql/sql_yacc.yy:
  Auto merged

into  zim.(none):/home/mikael/bug17127


sql/sql_yacc.yy:
  Auto merged

into  zim.(none):/home/mikael/bug17127


sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1


mysql-test/mysql-test-run.pl:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

declared in the 'for' statement is not portable, some compilers
still don't implement this ANSI C++ specification (Bug #14995)

into  zim.(none):/home/mikael/bug16370


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  zim.(none):/home/mikael/bug16370


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/sql_partition.cc:
  manual merge

into  zim.(none):/home/mikael/bug15961


sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

New error message


sql/share/errmsg.txt:
  New error message
sql/sql_partition.cc:
  New error message

into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new

into  zim.(none):/home/mikael/bug16370


sql/sql_yacc.yy:
  Auto merged

  Revise option description. And let's put it in the proper
  lexical order within the option list.


sql/mysqld.cc:
  Revise option description. And let's put it in the proper
  lexical order within the option list.

New test case (bug was already fixed)


mysql-test/r/ndb_partition_key.result:
  New test case
mysql-test/t/ndb_partition_key.test:
  New test case

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  mysql.com:/usr/local/mysql/tmpbuild-5.1

  Small change to enable sending of mails from Windows bk clones


BitKeeper/triggers/post-commit:
  Small change to enable sending of mails from Windows bk clones

into  mysql.com:/usr/local/mysql/mysql-5.1-new

sql/log_event.cc:
  Fix Windows compile errors.
storage/innobase/btr/btr0sea.c:
  Fix AIX compile error (declarations must come before code in traditional C).
sql/sql_class.h:
  Fix HPUX compile problem (HP compiler bug).
  Local class of member in derived class has no access to protected members,
  so make the class global and a friend.
sql/sql_insert.cc:
  Fix HPUX compile problem (HP compiler bug).
  Local class of member in derived class has no access to protected members,
  so make the class global and a friend.

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

into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new


sql/sql_yacc.yy:
  Auto merged