database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
This commit is contained in:
Alexander Nozdrin
2010-04-27 13:58:21 +04:00
parent a0f8951963 b6dcd0ecbe
commit e642701c32
182 changed files with 41913 additions and 11901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/t/mysqlbinlog.test
View File

@ -4,6 +4,10 @@
-- source include/have_log_bin.inc
--disable_query_log
CALL mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
--enable_query_log
# Deletes all the binary logs
reset master;
@ -141,7 +145,14 @@ EOF
# must be digestable for both client and server. In 4.1 the client
# should use default-character-set same as the server.
flush logs;
--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000004 | $MYSQL
# Due to BUG#18337 that wrongly suppresses the BINLOG EVENTS when
# --short-form is used, the "insert into t5 select * from `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`"
# which is unsafe and thus written to the binary log in the row
# format is not executed. This makes the assertion select * from t5
# /* must be (1),(1) */; to fail. To temporary fix the bug, we
# removed the option --short-form.
#--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000004 | $MYSQL
--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000004 | $MYSQL
select * from t5 /* must be (1),(1) */;
drop table t5;