bk commit into 5.1 tree (lars:1.2215) BUG#17780

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.2215 06/03/01 16:48:13 lars@stripped +1 -0
  BUG#17780: Incorrect result file.  (Test for that part is extra/binlog_tests/binlog_row_ctype_cp932.test)

  mysql-test/r/binlog_row_ctype_cp932.result
    1.4 06/03/01 16:48:05 lars@stripped +0 -14
    Corrected result file

# 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:	lars
# Host:	dl145k.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new

--- 1.3/mysql-test/r/binlog_row_ctype_cp932.result	2006-01-24 13:33:57 +01:00
+++ 1.4/mysql-test/r/binlog_row_ctype_cp932.result	2006-03-01 16:48:05 +01:00
@@ -11315,20 +11315,6 @@
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-RESET MASTER;
-CREATE TABLE t1(f1 blob);
-PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
-SET @var1= x'8300';
-EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 102;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	102	Query	1	189	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	189	Table_map	1	228	test.t1
-master-bin.000001	228	Write_rows	1	262	
-SELECT HEX(f1) FROM t1;
-HEX(f1)
-8300
-DROP table t1;
 SET collation_connection='cp932_japanese_ci';
 create table t1 select repeat('a',4000) a;
 delete from t1;