diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-06 14:03:16 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-06 14:03:16 +0100 |
| commit | d22e85df4d6da9acbba45ffff547499db3bd3a6e (patch) | |
| tree | 36c2676385aba1ebb3413611c08d421188da944c /mysql-test/r/sp.result | |
| parent | f03e338a3d6317622afa90a8259160d37cff6bb8 (diff) | |
| parent | df72c73d6ddd82992967dab3d58328284bf90010 (diff) | |
| download | mariadb-git-d22e85df4d6da9acbba45ffff547499db3bd3a6e.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/binary.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index b2311e81462..6636f799b5d 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -2418,7 +2418,7 @@ create table t3 as select bug2773()| show create table t3| Table Create Table t3 CREATE TABLE `t3` ( - `bug2773()` int(11) default NULL + `bug2773()` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t3| drop function bug2773| @@ -2479,7 +2479,7 @@ tinyint 1 -128 127 0 0 YES YES NO YES YES NO NULL,0 A very small integer tinyint unsigned 1 0 255 0 0 YES YES YES YES YES NO NULL,0 A very small integer Table Create Table t1 CREATE TABLE `t1` ( - `id` char(16) NOT NULL default '', + `id` char(16) NOT NULL DEFAULT '', `data` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Database Create Database @@ -2533,7 +2533,7 @@ tinyint 1 -128 127 0 0 YES YES NO YES YES NO NULL,0 A very small integer tinyint unsigned 1 0 255 0 0 YES YES YES YES YES NO NULL,0 A very small integer Table Create Table t1 CREATE TABLE `t1` ( - `id` char(16) NOT NULL default '', + `id` char(16) NOT NULL DEFAULT '', `data` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Database Create Database @@ -3852,7 +3852,7 @@ end| call bug12589_1()| Table Create Table tm1 CREATE TEMPORARY TABLE `tm1` ( - `spv1` decimal(3,3) default NULL + `spv1` decimal(3,3) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Warnings: Warning 1264 Out of range value for column 'spv1' at row 1 @@ -3860,12 +3860,12 @@ Warning 1366 Incorrect decimal value: 'test' for column 'spv1' at row 1 call bug12589_2()| Table Create Table tm1 CREATE TEMPORARY TABLE `tm1` ( - `spv1` decimal(6,3) default NULL + `spv1` decimal(6,3) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 call bug12589_3()| Table Create Table tm1 CREATE TEMPORARY TABLE `tm1` ( - `spv1` decimal(6,3) default NULL + `spv1` decimal(6,3) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop procedure bug12589_1| drop procedure bug12589_2| |