into  shellback.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  SCCS merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.1

into  shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195


include/config-win.h:
  Auto merged

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

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:/opt/local/work/mysql-5.1-root

SHOW AUTHORS caused 'Packets out of order' in stored functions:
add the corresponding SQLCOM to sp_get_flags_for_command so that
it'd return sp-related flags for it. 
Fix Bug#17403 "Events: packets out of order with show create event"
in the same chaneset.


mysql-test/r/events.result:
  Update the results (Bug#17403)
mysql-test/r/sp-error.result:
  Test results fixed (Bug#16164)
mysql-test/t/events.test:
  Add a test case for Bug#17403 "Events: packets out of order with
  show create event"
mysql-test/t/sp-error.test:
  Add a test case for Bug#16164 "Easter egg"
sql/sp_head.cc:
  Add SHOW AUTHORS to the list of commands that return a result
  set: such commands are not allowed in stored functions and
  triggers. Add SHOW CREATE EVENT for the same reason.

out in the target directories.

sql/cmakelists.txt:
  Rename: sql/sql -> sql/cmakelists.txt
zlib/cmakelists.txt:
  Rename: win/cmakefiles/zlib -> zlib/cmakelists.txt
vio/cmakelists.txt:
  Rename: win/cmakefiles/vio -> vio/cmakelists.txt
regex/cmakelists.txt:
  Rename: win/cmakefiles/regex -> regex/cmakelists.txt
mysys/cmakelists.txt:
  Rename: win/cmakefiles/mysys -> mysys/cmakelists.txt
cmakelists.txt:
  Rename: win/cmakefiles/base -> cmakelists.txt
dbug/cmakelists.txt:
  Rename: win/cmakefiles/dbug -> dbug/cmakelists.txt
strings/cmakelists.txt:
  Rename: win/cmakefiles/strings -> strings/cmakelists.txt
libmysql/cmakelists.txt:
  Rename: win/cmakefiles/libmysql -> libmysql/cmakelists.txt
client/cmakelists.txt:
  Rename: win/cmakefiles/client -> client/cmakelists.txt
extra/cmakelists.txt:
  Rename: win/cmakefiles/extra -> extra/cmakelists.txt
tests/cmakelists.txt:
  Rename: win/cmakefiles/tests -> tests/cmakelists.txt
server-tools/instance-manager/cmakelists.txt:
  Rename: win/cmakefiles/im -> server-tools/instance-manager/cmakelists.txt
storage/heap/cmakelists.txt:
  Rename: win/cmakefiles/heap -> storage/heap/cmakelists.txt
storage/myisam/cmakelists.txt:
  Rename: win/cmakefiles/myisam -> storage/myisam/cmakelists.txt
storage/myisammrg/cmakelists.txt:
  Rename: win/cmakefiles/myisammrg -> storage/myisammrg/cmakelists.txt
storage/bdb/cmakelists.txt:
  Rename: win/cmakefiles/bdb -> storage/bdb/cmakelists.txt
storage/innobase/cmakelists.txt:
  Rename: win/cmakefiles/innobase -> storage/innobase/cmakelists.txt
extra/yassl/cmakelists.txt:
  Rename: win/cmakefiles/yassl -> extra/yassl/cmakelists.txt
extra/yassl/taocrypt/cmakelists.txt:
  Rename: win/cmakefiles/taocrypt -> extra/yassl/taocrypt/cmakelists.txt
BitKeeper/deleted/.del-deploy.bat~f6b42340:
  Delete: win/cmakefiles/deploy.bat

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

 - Replication of tables with autoincrement not supported when maste and or slave uses storage engine "ndb"


mysql-test/t/disabled.def:
  Remove disabling of testscase
mysql-test/t/rpl_ndb_multi_update2.test:
  Only run this test when row based replication is available

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

 - Add HAVE_OPENSSL and HAVE_YASSL to config-win.h


include/config-win.h:
  Define HAVE_OPENSSL and HAVE_YASSL to make the server and client enable SSL support

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