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


sql/sql_table.cc:
  Auto merged

that the entire server uses their public ha_* counterparts instead,
since only then we can ensure proper tracing of these calls that
is necessary for Bug#12713.
A pre-requisite for Bug#12713 "Error in a stored function called from 
a SELECT doesn't cause ROLLBACK of statem"


sql/ha_partition.cc:
  Use ha_write_row, ha_update_row, ha_delete_row instead of now-private
  write_row, update_row, delete_row. 
  In future ha_* calls will contain more than just a call to the binary
  log, so it's essential they are used consistently everywhere in the server.
  
  Disable the undesired effect of double binary logging of changes
  to partitioned tables with tmp_disable_binlog.
sql/handler.h:
  Make write_row, update_row, delete_row private. It's critical
  that the entire code base uses ha_write_row, ha_update_row, ha_delete_row
  instead -- in future, ha_* counterparts will have more common
  functionality than just a call to the binary log.
sql/sql_select.cc:
  Use ha_write_row, ha_update_row, ha_delete_row instead of
  write_row, update_row, delete_row respectively. 
  The change affects the join execution code that works with an
  intermediate internal temporary table. Do not disable binary logging,
  since it's unnecessary - temporary tables are not replicated
  by row level replication.
sql/sql_table.cc:
  Use ha_write_row in copy_data_between_tables - the function
  that writes data from the original table to a temporary copy
  when executing ALTER TABLE. Do not disable binary logging
  since temporary tables are not replicated by row level 
  replication anyway.

Ensure that all SQLCOM_ constants have corresponding Com_ variables.


mysql-test/r/status.result:
  Tests updated.
sql/mysqld.cc:
  Followup for bug#30252.
  Rename few variables to match SQL syntax.
  Ensure that all SQLCOM_ constants have corresponding Com_ variables.

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1

sql/handler.h:
  Collect ha_* wrappers and their virtual counterparts into two
  symmetrical groups. Previously they were scattered all over class
  handler declaration. That should ease maintenance and addition
  of new ha_ wrappers.
  When a new ha_* wrapper is added, it should be added to the
  end of the ha_* group. Its virtual counterpart should become private
  and be moved to the end of the hander class.

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1

into  damien-katzs-computer.local:/Users/dkatz/Com_create_function


sql/mysqld.cc:
  Auto merged

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged

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

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)

Added Com_create_spfunction and all other commands previously missing to the global status variables.

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


client/mysqldump.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged

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

into  damien-katzs-computer.local:/Users/dkatz/51runtime


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


storage/blackhole/ha_blackhole.cc:
  use local

mysql-test/r/partition_range.result:
  removed fix for bug#30573
mysql-test/suite/parts/r/rpl_partition.result:
  updated result file
mysql-test/t/partition_range.test:
  removed test case for bug#30573
sql/ha_partition.cc:
  removed fix for bug#30573