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

merged 5.1 main to 5.1-rpl

2008-08-04 07:04:47 +02:00

binlog_database.result

BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a

2010-04-20 10:10:43 +01:00

binlog_delete_and_flush_index.result

BUG#34582: FLUSH LOGS does not close and reopen the binlog index

2009-10-20 09:39:40 +01:00

binlog_format_switch_in_tmp_table.result

Bug #45855 row events in binlog after switch from binlog_fmt=mix to stmt with open tmp tbl

2010-01-26 17:41:15 +08:00

binlog_grant.result

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

binlog_implicit_commit.result

Bug #37221: SET AUTOCOMMIT=1 does not commit binary log

2009-09-23 13:20:48 +02:00

binlog_incident.result

Bug#46010 main.ctype_gbk_binlog fails sporadically : Table 't2' already exists

2009-09-07 13:42:54 +08:00

binlog_index.result

BUG#49638 binlog_index fails in mysql-trunk-merge

2009-12-16 19:52:56 +00:00

binlog_innodb_row.result

BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a

2010-04-20 10:10:43 +01:00

binlog_innodb.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_killed_simulate.result

Manual merge from mysql-trunk-merge.

2010-01-19 19:36:14 +03:00

binlog_killed.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_max_extension.result

BUG#40611: MySQL cannot make a binary log after sequential number

2009-11-22 03:59:48 +00:00

binlog_mix_innodb_stat.result

BUG#50038 Deadlock on flush logs with concurrent DML and RBR

2010-01-05 16:55:23 +00:00

binlog_multi_engine.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_old_versions.result

…

binlog_row_binlog.result

BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a

2010-04-20 10:10:43 +01:00

binlog_row_ctype_cp932.result

Merge stella.local:/home2/mydev/mysql-5.1-amain

2008-03-26 10:27:00 +01:00

binlog_row_ctype_ucs.result

Bug#41371 Select returns 1 row with condition "col is not null and col is null"

2009-11-03 17:54:41 +04:00

binlog_row_drop_tbl.result

Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,

2009-12-05 02:02:48 +03:00

binlog_row_drop_tmp_tbl.result

BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a

2010-04-20 10:10:43 +01:00

binlog_row_innodb_stat.result

BUG#50038 Deadlock on flush logs with concurrent DML and RBR

2010-01-05 16:55:23 +00:00

binlog_row_insert_select.result

WL#2687 WL#5072 BUG#40278 BUG#47175

2009-11-03 19:02:56 +00:00

binlog_row_mix_innodb_myisam.result

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

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

binlog_row_mysqlbinlog_db_filter.result

BUG#42941: --database paramater to mysqlbinlog fails with RBR

2009-06-07 23:28:08 +01:00

binlog_row_mysqlbinlog_verbose.result

Attempt to fix Windows testcase output issue

2009-10-14 21:25:11 +08:00

binlog_sql_mode.result

BUG#39526 sql_mode not retained in binary log for CREATE PROCEDURE

2009-02-28 09:35:18 +08:00

binlog_start_comment.result

Fix after merge

2008-02-28 18:55:46 +01:00

binlog_statement_insert_delayed.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_stm_binlog.result

BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a

2010-04-20 10:10:43 +01:00

binlog_stm_blackhole.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_stm_ctype_cp932.result

Merge stella.local:/home2/mydev/mysql-5.1-amain

2008-03-26 10:27:00 +01:00

binlog_stm_ctype_ucs.result

merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge

2010-01-07 15:39:11 +00:00

binlog_stm_do_db.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_stm_drop_tbl.result

Merge next-mr -> next-4284.

2010-02-05 01:08:08 +03:00

binlog_stm_drop_tmp_tbl.result

Manual Merge

2009-11-03 18:20:08 +08:00

binlog_stm_innodb_stat.result

BUG#50038 Deadlock on flush logs with concurrent DML and RBR

2010-01-05 16:55:23 +00:00

binlog_stm_insert_select.result

WL#2687 WL#5072 BUG#40278 BUG#47175

2009-11-03 19:02:56 +00:00

binlog_stm_mix_innodb_myisam.result

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

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

binlog_stm_ps.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_stm_row.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_stm_unsafe_warning.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_stm_user_variables.result

BUG#49562: SBR out of sync when using numeric data types + user

2010-01-19 23:16:22 +00:00

binlog_switch_inside_trans.result

BUG#51277 SUPER_ACL should be checked unconditionally (binlog_format and binlog_direct)

2010-02-24 12:45:15 +00:00

binlog_tmp_table.result

BUG#53101: binlog.binlog_tmp_table fails on sol10 sparc64 max in

2010-04-27 12:25:55 +01:00

binlog_truncate_innodb.result

Bug #36763

2009-02-06 17:06:41 +01:00

binlog_truncate_myisam.result

Bug #36763

2009-02-10 22:26:37 +01:00

binlog_unsafe.result

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

binlog_write_error.result

Merge next-mr -> next-4284.

2010-02-04 23:15:47 +03:00