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  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.

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

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1


BitKeeper/triggers/post-commit:
  Auto merged

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0

  Rationalise setting $FROM.


BitKeeper/triggers/post-commit:
  Rationalise setting $FROM.

into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt

into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt


client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/emb_qcache.cc:
  Auto merged
libmysqld/emb_qcache.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/protocol.cc:
  SCCS merged

into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

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


sql/mysqld.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

sql/sql_class.h:
  Remove an unused argument.
sql/sql_update.cc:
  Remove an unused argument.

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

client/mysqltest.c:
  Remove a call to my_message() (server call) in case of a client error.
  It asserts in the embedded build now, since is called after send_ok().
libmysqld/emb_qcache.cc:
  Use net_send_eof (embedded implementation) in embedded query cache/
  send result to client, since send_eof currently does not
  send anything.
libmysqld/emb_qcache.h:
  Declare net_send_eof.
libmysqld/lib_sql.cc:
  Fix the main loop of the embedded server to use the new Diagnostics_area
  API.
sql/log.cc:
  Silence errors of open_performance_schema_table. This function
  is called for general logging, and it happens after the error
  has been sent to the client, and thus triggers an assert.
storage/myisam/ha_myisam.cc:
  Remove an old hack that broke repair.test in embedded build:
  unless we clear an error here, the server attempts to send OK after
  ERROR. This currently asserts.

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  whalegate.ndb.mysql.com:/home/tomas/cge-5.1


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

- during commit deadlock timeout needs to be at least 5 times db hearbeat

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


storage/blackhole/ha_blackhole.cc:
  use local