Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

mysql-test/r/binlog_row_ctype_cp932.result

@@ -11315,20 +11315,6 @@ DROP TABLE t1;
 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;