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


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

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

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

mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test:
  Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test -> mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test
mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result:
  Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result -> mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt:
  Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt -> mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt
mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test:
  Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test -> mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result:
  Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result -> mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test:
  Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test -> mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
  Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result -> mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result

  remove dead code


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  remove dead code
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  remove dead code

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


netware/mysql_test_run.c:
  Auto merged
sql/sp_head.cc:
  Auto merged

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

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

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


client/mysql.cc:
  Auto merged

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

client/mysql.cc:
  BUG#33057, avoid calling strlen() *for every single character* in the client's input

into  zim.(none):/home/bk/mysql-5.1-arch


client/client_priv.h:
  Auto merged
client/mysqlslap.c:
  Auto merged
mysql-test/r/mysqlslap.result:
  Auto merged

  Removed dead option
mysqlslap.c:
  Updates from Paul for help.
  Removed dead option


client/mysqlslap.c:
  Updates from Paul for help.
  Removed dead option
client/client_priv.h:
  Removed dead option

- make sure to reset the read and write sets

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

When partition pruning resulted in an ordered index scan spanning only
one partition, any descending flag for the scan was wrongly discarded,
turning ORDER BY DESC into ORDER BY ASC, and similar problems.

Fixed by correctly passing descending flag in SCAN_TABREQ signal sent
to data nodes.


mysql-test/suite/ndb/r/ndb_partition_key.result:
  Test case.
mysql-test/suite/ndb/r/ndb_partition_range.result:
  Test case.
mysql-test/suite/ndb/t/ndb_partition_key.test:
  Test case.
mysql-test/suite/ndb/t/ndb_partition_range.test:
  Test case.
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Even if ordered scan not requested (no need to merge-sorts scans of
  each partition), we still need to honor the descending flag.

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

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

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

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


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

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

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


sql/sql_table.cc:
  Auto merged

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

rpl_ndb tests on sapsrv1.


sql/ha_ndbcluster_binlog.cc:
  Try to fix assertion failures at slave shutdown when running
  rpl_ndb tests. If the binlog thread is killed, which happens during
  shutdown, open_tables returns error without setting an error
  in THD. Therefore one can't access thd->main_da.message() if thd->killed.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

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


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

Adding the tests cases alone for WL#4165, disabled


mysql-test/t/disabled.def:
  WL#4165 (Prepared statements: validation)
mysql-test/r/ps_ddl.result:
  WL#4165 (Prepared statements: validation)
mysql-test/t/ps_ddl.test:
  WL#4165 (Prepared statements: validation)

- Enable check for symbolic link files.


sql/sql_table.cc:
  Bug#26811 Symbolic links don't work in Windows Vista
  - On systems that support symbolic link files, make sure to check for them.

  Corrected typo


sql/sp_head.cc:
  Corrected typo

  Made sp_head::operator delete() match prototype, added throw()
mysql_test_run.c, mysqld_safe.c:
  Include "mysql_version.h" to get MYSQL_PORT defined


sql/sp_head.cc:
  Made sp_head::operator delete() match prototype, added throw()
netware/mysql_test_run.c:
  Include "mysql_version.h" to get MYSQL_PORT defined
netware/mysqld_safe.c:
  Include "mysql_version.h" to get MYSQL_PORT defined

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

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


configure.in:
  null merge

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