bk commit into 5.0 tree (sergefp:1.1954) BUG#14480

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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.1954 05/11/09 14:47:58 sergefp@stripped +2 -0
  BUG#14480 post-fix: merge to 5.0

  mysql-test/t/create.test
    1.68 05/11/09 14:47:49 sergefp@stripped +7 -0
    BUG#14480 post-fix: merge to 5.0

  mysql-test/r/create.result
    1.106 05/11/09 14:47:49 sergefp@stripped +17 -5
    BUG#14480 post-fix: merge to 5.0

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-nov08-push

--- 1.105/mysql-test/r/create.result	2005-11-09 10:12:54 +03:00
+++ 1.106/mysql-test/r/create.result	2005-11-09 14:47:49 +03:00
@@ -662,11 +662,14 @@
 a varchar(12) charset utf8 collate utf8_bin not null, 
 b int not null, primary key (a)
 ) select a, 1 as b from t2 ;
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
+Warning	1364	Field 'b' doesn't have a default value
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL default '',
-  `b` int(11) NOT NULL default '0',
+  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,
+  `b` int(11) NOT NULL,
   PRIMARY KEY  (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -674,11 +677,14 @@
 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 ;
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
+Warning	1364	Field 'b' doesn't have a default value
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL default '',
-  `b` int(11) NOT NULL default '0',
+  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,
+  `b` int(11) NOT NULL,
   PRIMARY KEY  (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -686,11 +692,13 @@
 a varchar(12) charset utf8 collate utf8_bin,
 b int not null, primary key (a)
 ) select 'a' as a , 1 as b from t2 ;
+Warnings:
+Warning	1364	Field 'b' doesn't have a default value
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(12) character set utf8 collate utf8_bin NOT NULL default '',
-  `b` int(11) NOT NULL default '0',
+  `b` int(11) NOT NULL,
   PRIMARY KEY  (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
@@ -704,6 +712,8 @@
 a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,
 primary key (a1)
 ) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;
+Warnings:
+Warning	1364	Field 'a1' doesn't have a default value
 drop table t2;
 create table t2 ( 
 a1 varchar(12) charset utf8 collate utf8_bin,
@@ -719,6 +729,8 @@
 a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,
 primary key (a1)
 ) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;
+Warnings:
+Warning	1364	Field 'a1' doesn't have a default value
 drop table t2;
 create table t2 ( a int default 3, b int default 3)
 select a1,a2 from t1;

--- 1.67/mysql-test/t/create.test	2005-11-09 10:12:54 +03:00
+++ 1.68/mysql-test/t/create.test	2005-11-09 14:47:49 +03:00
@@ -563,6 +563,7 @@
 );
 insert into t2 values(111);
 
+--warning 1364
 create table t1 ( 
   a varchar(12) charset utf8 collate utf8_bin not null, 
   b int not null, primary key (a)
@@ -570,6 +571,7 @@
 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)
@@ -577,6 +579,7 @@
 show create table t1;
 drop table t1;
 
+--warning 1364
 create table t1 ( 
   a varchar(12) charset utf8 collate utf8_bin,
   b int not null, primary key (a)
@@ -590,6 +593,7 @@
 );
 insert into t1 values (1,1,1, 1,1,1, 1,1,1);
 
+--warning 1364
 create table t2 ( 
   a1 varchar(12) charset utf8 collate utf8_bin not null,
   a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,
@@ -597,17 +601,20 @@
 ) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;
 drop table t2;
 
+--warning 1364
 create table t2 ( 
   a1 varchar(12) charset utf8 collate utf8_bin,
   a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int
 ) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1;
 
 drop table t1, t2;
+--warning 1364
 create table t1 ( 
   a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int
 );
 insert into t1 values (1,1,1, 1,1,1, 1,1,1);
 
+--warning 1364
 create table t2 ( 
   a1 varchar(12) charset utf8 collate utf8_bin not null,
   a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,