bk commit into 5.0 tree (aelkin:1.2155) BUG#14157

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of aelkin. When aelkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2155 06/05/31 12:51:21 aelkin@stripped +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  missed table to drop after merge from 4.1 

  mysql-test/t/mysqlbinlog.test
    1.29 06/05/31 12:51:15 aelkin@stripped +1 -1
    manual merge post-fix

  mysql-test/r/mysqlbinlog.result
    1.24 06/05/31 12:51:15 aelkin@stripped +5 -1
    result changed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dl145k.mysql.com
# Root:	/tmp/andrei/MERGE/5.0

--- 1.23/mysql-test/r/mysqlbinlog.result	2006-05-16 10:00:52 +02:00
+++ 1.24/mysql-test/r/mysqlbinlog.result	2006-05-31 12:51:15 +02:00
@@ -190,4 +190,8 @@
 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;

--- 1.28/mysql-test/t/mysqlbinlog.test	2006-05-31 10:47:10 +02:00
+++ 1.29/mysql-test/t/mysqlbinlog.test	2006-05-31 12:51:15 +02:00
@@ -135,6 +135,6 @@
 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