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

into  mysql.com:/home/my/mysql-5.0

1 files changed, 16 insertions, 0 deletions

diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 4e99b0c4b8b..162db3d0c0a 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -566,6 +566,22 @@ drop table t1;
 
 --warning 1364
 create table t1 ( 
+  a varchar(12) charset utf8 collate utf8_bin not null, 
+  b int not null, primary key (a)
+) select a, 1 as c from t2 ;
+show create table t1;
+drop table t1;
+
+--warning 1364
+create table t1 ( 
+  a varchar(12) charset utf8 collate utf8_bin not null, 
+  b int null, primary key (a)
+) select a, 1 as c from t2 ;
+show create table t1;
+drop table t1;
+
+--warning 1364
+create table t1 ( 
   a varchar(12) charset utf8 collate utf8_bin not null,
   b int not null, primary key (a)
 ) select 'a' as a , 1 as b from t2 ;