bzr push into mysql-trunk branch (john.embretsen:3527 to 3528) Bug#45730

[John H. Embretsen]

 3528 John H. Embretsen	2011-01-18 [merge]
      Merge of post push fix for bug#45730 from mysql-5.5 to mysql-trunk.

    modified:
      mysql-test/r/show_check.result
      mysql-test/t/show_check.test
 3527 Luis Soares	2011-01-18 [merge]
      Automerge from bug branch into latest mysql-trunk.

    modified:
      client/mysqlbinlog.cc
=== modified file 'mysql-test/r/show_check.result'
--- a/mysql-test/r/show_check.result	2011-01-17 07:14:27 +0000
+++ b/mysql-test/r/show_check.result	2011-01-18 13:09:35 +0000
@@ -1334,7 +1334,7 @@ CREATE DATABASE `�`;
 CREATE TABLE `�`.`�` (a int) ENGINE=Memory;
 SHOW TABLE STATUS FROM `�` LIKE '�';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-�	MEMORY	10	Fixed	0	8	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+�	MEMORY	10	Fixed	0	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 DROP DATABASE `�`;
 show columns from `#mysql50#????????`;
 Got one of the listed errors

=== modified file 'mysql-test/t/show_check.test'
--- a/mysql-test/t/show_check.test	2011-01-17 07:14:27 +0000
+++ b/mysql-test/t/show_check.test	2011-01-18 13:09:35 +0000
@@ -1073,7 +1073,7 @@ set names latin1;
 SET NAMES latin1;
 CREATE DATABASE `�`;
 CREATE TABLE `# 9 #
+--replace_column 6 # 7 # 8 # 9 #
 SHOW TABLE STATUS FROM `�` LIKE '�';
 DROP DATABASE `�`;
 

No bundle (reason: useless for push emails).