3107 Sven Sandberg 2009-09-30
post-merge fixes to make tests pass after merging BUG#39934 to 5.1-rep+3.
modified:
mysql-test/r/sp_trans.result
mysql-test/t/sp_trans.test
3106 Sven Sandberg 2009-09-30 [merge]
merged fixes for BUG#39934 to 5.1-rpl+3
Also renamed current_stmt_binlog_row_based to
current_stmt_binlog_format_row for consistency
removed:
mysql-test/r/have_dynamic_loading.require
mysql-test/r/have_example_plugin.require
mysql-test/r/have_simple_parser.require
mysql-test/r/have_udf_example.require
mysql-test/suite/rpl/t/rpl_idempotency-slave.opt
added:
mysql-test/extra/rpl_tests/create_recursive_construct.inc
mysql-test/suite/binlog/t/binlog_unsafe-master.opt
mysql-test/suite/rpl/r/rpl_mix_found_rows.result
mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result
mysql-test/suite/rpl/r/rpl_row_idempotency.result
mysql-test/suite/rpl/t/rpl_mix_found_rows.test
mysql-test/suite/rpl/t/rpl_mix_insert_delayed.test
mysql-test/suite/rpl/t/rpl_row_idempotency.test
mysql-test/suite/rpl_ndb/combinations
mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
renamed:
mysql-test/suite/rpl/r/rpl_found_rows.result => mysql-test/suite/rpl/r/rpl_stm_found_rows.result
mysql-test/suite/rpl/t/rpl_found_rows.test => mysql-test/suite/rpl/t/rpl_stm_found_rows.test
modified:
mysql-test/extra/rpl_tests/rpl_foreign_key.test
mysql-test/extra/rpl_tests/rpl_insert_delayed.test
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
mysql-test/include/have_example_plugin.inc
mysql-test/include/have_simple_parser.inc
mysql-test/include/have_udf.inc
mysql-test/include/rpl_udf.inc
mysql-test/r/partition_innodb_stmt.result
mysql-test/r/sp_trans.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/binlog/r/binlog_multi_engine.result
mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
mysql-test/suite/binlog/r/binlog_stm_ps.result
mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
mysql-test/suite/binlog/r/binlog_unsafe.result
mysql-test/suite/binlog/t/binlog_innodb.test
mysql-test/suite/binlog/t/binlog_multi_engine.test
mysql-test/suite/binlog/t/binlog_unsafe.test
mysql-test/suite/parts/r/rpl_partition.result
mysql-test/suite/parts/t/rpl_partition.test
mysql-test/suite/rpl/r/rpl_events.result
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result
mysql-test/suite/rpl/r/rpl_idempotency.result
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
mysql-test/suite/rpl/r/rpl_stm_loadfile.result
mysql-test/suite/rpl/r/rpl_temporary_errors.result
mysql-test/suite/rpl/r/rpl_udf.result
mysql-test/suite/rpl/t/rpl_bug31076.test
mysql-test/suite/rpl/t/rpl_events.test
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test
mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test
mysql-test/suite/rpl/t/rpl_idempotency.test
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
mysql-test/suite/rpl/t/rpl_row_insert_delayed.test
mysql-test/suite/rpl/t/rpl_slave_skip.test
mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
mysql-test/suite/rpl/t/rpl_temporary_errors.test
mysql-test/suite/rpl/t/rpl_udf.test
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test
mysql-test/t/mysqldump.test
mysql-test/t/partition_innodb_stmt.test
sql/event_db_repository.cc
sql/events.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/handler.cc
sql/item_create.cc
sql/log.cc
sql/log_event.cc
sql/log_event_old.cc
sql/mysql_priv.h
sql/rpl_injector.cc
sql/set_var.cc
sql/share/errmsg.txt
sql/sp.cc
sql/sp_head.cc
sql/sp_head.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_repl.cc
sql/sql_table.cc
sql/sql_udf.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
storage/example/ha_example.cc
storage/example/ha_example.h
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.cc
mysql-test/suite/rpl/r/rpl_stm_found_rows.result
mysql-test/suite/rpl/t/rpl_stm_found_rows.test
=== modified file 'mysql-test/r/sp_trans.result'
--- a/mysql-test/r/sp_trans.result 2009-07-22 16:16:17 +0000
+++ b/mysql-test/r/sp_trans.result 2009-09-30 16:20:52 +0000
@@ -506,8 +506,6 @@ select count(*)*255 from t3 into table_s
until table_size > max_table_size*2 end repeat;
end|
call bug14210_fill_table()|
-Warnings:
-Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason: Statement uses a system variable whose value may differ on slave.
drop procedure bug14210_fill_table|
create table t4 like t3|
create procedure bug14210()
=== modified file 'mysql-test/t/sp_trans.test'
--- a/mysql-test/t/sp_trans.test 2007-06-15 16:56:11 +0000
+++ b/mysql-test/t/sp_trans.test 2009-09-30 16:20:52 +0000
@@ -527,7 +527,9 @@ begin
select count(*)*255 from t3 into table_size;
until table_size > max_table_size*2 end repeat;
end|
+--disable_warnings
call bug14210_fill_table()|
+--enable_warnings
drop procedure bug14210_fill_table|
create table t4 like t3|
Attachment: [text/bzr-bundle] bzr/sven.sandberg@sun.com-20090930162052-dkhzpsh3i2g1ltv3.bundle
| Thread |
|---|
| • bzr push into mysql-5.1 branch (sven.sandberg:3106 to 3107) Bug#39934 | Sven Sandberg | 30 Sep |
