Alexey Kopytov b69a31fad5 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. ...

Conflicts:

   conflict      Makefile.am
   conflict      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
   conflict      mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
   conflict      sql/opt_sum.cc
   conflict      sql/set_var.cc
   conflict      sql/sql_base.cc
   conflict      sql/sql_priv.h
   conflict      sql/sql_show.cc

2010-05-24 00:41:18 +04:00

..

binlog_tests

Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.

2010-05-24 00:41:18 +04:00

rpl_tests

Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.

2010-05-24 00:41:18 +04:00