Skip to content

M
MariaDB
Commit c48a5e8b authored by bar@mysql.com's avatar bar@mysql.com
Browse files
Options

After merge fix

parent 7e38927a
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
mysql-test/r/mysqlbinlog.result
View file @ c48a5e8b
...@@ -272,7 +272,6 @@ call p1(); ...@@ -272,7 +272,6 @@ call p1();
1 1
1 1
drop procedure p1; drop procedure p1;
drop table t1, t2, t03, t04, t3, t4, t5;
flush logs; flush logs;
create table t1 (a varchar(64) character set utf8); create table t1 (a varchar(64) character set utf8);
load data infile '../std_data_ln/loaddata6.dat' into table t1; load data infile '../std_data_ln/loaddata6.dat' into table t1;
......
mysql-test/t/mysqlbinlog.test
View file @ c48a5e8b
...@@ -189,8 +189,6 @@ drop procedure p1; ...@@ -189,8 +189,6 @@ drop procedure p1;
--exec $MYSQL_BINLOG --version 2>&1 > /dev/null --exec $MYSQL_BINLOG --version 2>&1 > /dev/null
--exec $MYSQL_BINLOG --help 2>&1 > /dev/null --exec $MYSQL_BINLOG --help 2>&1 > /dev/null
--enable_query_log --enable_query_log
# clean up
drop table t1, t2, t03, t04, t3, t4, t5;
# #
# Bug#15126 character_set_database is not replicated # Bug#15126 character_set_database is not replicated
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7