Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/Users/mikron/bug10837

mysql-test/t/default.test

@@ -4,7 +4,6 @@
 --disable_warnings
 drop table if exists t1,t2,t3,t4,t5,t6;
 drop database if exists mysqltest;
---enable_warnings
 
 #
 # Bug 10838
@@ -39,6 +38,7 @@ CREATE TABLE t1 (a varchar(30) binary NOT NULL DEFAULT ' ',
                  a1 varchar(30) binary NOT NULL DEFAULT ' ',
 		 b1 tinyblob NULL)
 ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
+--enable_warnings
 
 SHOW CREATE TABLE t1;
 INSERT into t1 (b) values ('1');