Commit 18f1d1a2 authored by unknown's avatar unknown
Browse files

After merge fix

parent de61d5b0
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ call p1();
1
1
drop procedure p1;
drop table t1, t2, t03, t04, t3, t4, t5;
flush logs;
create table t1 (a varchar(64) character set utf8);
load data infile '../std_data_ln/loaddata6.dat' into table t1;
+0 −2
Original line number Diff line number Diff line
@@ -189,8 +189,6 @@ drop procedure p1;
--exec $MYSQL_BINLOG --version 2>&1 > /dev/null
--exec $MYSQL_BINLOG --help 2>&1 > /dev/null
--enable_query_log
# clean up
drop table t1, t2, t03, t04, t3, t4, t5; 

#
# Bug#15126 character_set_database is not replicated