Commit 1b701050 authored by unknown's avatar unknown
Browse files

BUG#14157: utf8 encoding in binlog without set character_set_client 

missed table to drop after merge from 4.1 


mysql-test/r/mysqlbinlog.result:
  result changed
mysql-test/t/mysqlbinlog.test:
  manual merge post-fix
parent 8c7209e5

mysql-test/r/mysqlbinlog.result

+5 −1
Original line number Diff line number Diff line
@@ -190,4 +190,8 @@ select HEX(f) from t4; 
HEX(f)

835C

flush logs;

drop table t1, t2, t03, t04, t3, t4;
 
select * from t5  /* must be (1),(1) */;

a

1

1

drop table t1, t2, t03, t04, t3, t4, t5;

mysql-test/t/mysqlbinlog.test

+1 −1
Original line number Diff line number Diff line
@@ -135,6 +135,6 @@ flush logs; 
select * from t5  /* must be (1),(1) */;



# clean up

drop table t1, t2, t03, t04, t3, t4; 

drop table t1, t2, t03, t04, t3, t4, t5; 



# End of 5.0 tests