| List: | Internals | « Previous MessageNext Message » | |
| From: | jimw | Date: | January 15 2005 2:09am |
| Subject: | bk commit into 5.0 tree (jimw:1.1762) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 repository of jimw. When jimw 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://www.mysql.com/doc/I/n/Installing_source_tree.html ChangeSet 1.1762 05/01/14 17:09:35 jimw@stripped +28 -0 Enable warnings for 'no default' fields being set to default when they are not specified in an insert. Most of these changes are actually to clean up the test suite to either specify defaults to avoid warnings, or add the warnings to the results. Related to bug #5986. sql/sql_insert.cc 1.138 05/01/14 11:32:23 jimw@stripped +7 -6 Change check_that_all_fields_are_given_values() to issue warnings for all fields, and not only run when thd->abort_on_warning is set and error on just the first field. mysql-test/r/warnings.result 1.30 05/01/14 11:30:26 jimw@stripped +2 -0 Update results mysql-test/r/type_ranges.result 1.31 05/01/14 11:30:22 jimw@stripped +4 -4 Update results mysql-test/r/type_blob.result 1.44 05/01/14 11:30:17 jimw@stripped +1 -1 Update results mysql-test/r/strict.result 1.14 05/01/14 11:30:12 jimw@stripped +8 -0 Update results mysql-test/r/sp.result 1.103 05/01/14 11:30:08 jimw@stripped +3 -3 Update results mysql-test/r/rpl000001.result 1.28 05/01/14 11:30:05 jimw@stripped +4 -0 Update results mysql-test/r/order_by.result 1.47 05/01/14 11:30:02 jimw@stripped +1 -1 Update results mysql-test/r/null.result 1.30 05/01/14 11:30:00 jimw@stripped +1 -1 Update results mysql-test/r/limit.result 1.8 05/01/14 11:29:56 jimw@stripped +1 -1 Update results mysql-test/r/help.result 1.5 05/01/14 11:29:50 jimw@stripped +16 -0 Update results mysql-test/r/grant2.result 1.17 05/01/14 11:29:47 jimw@stripped +4 -0 Update results mysql-test/r/grant.result 1.38 05/01/14 11:29:44 jimw@stripped +4 -0 Update results mysql-test/r/gis-rtree.result 1.11 05/01/14 11:29:40 jimw@stripped +0 -1 Update results mysql-test/r/ctype_many.result 1.11 05/01/14 11:28:58 jimw@stripped +847 -845 Update results mysql-test/r/ctype_latin1_de.result 1.20 05/01/14 11:28:54 jimw@stripped +2 -2 Update results mysql-test/r/create.result 1.81 05/01/14 11:28:51 jimw@stripped +4 -0 Update results mysql-test/t/type_ranges.test 1.11 05/01/13 19:22:55 jimw@stripped +4 -4 Set default values mysql-test/t/type_blob.test 1.26 05/01/13 19:21:52 jimw@stripped +1 -1 Set default value mysql-test/t/sp.test 1.98 05/01/13 19:20:51 jimw@stripped +1 -1 Add default value mysql-test/t/show_check.test 1.43 05/01/13 19:19:32 jimw@stripped +4 -4 Add defaults mysql-test/t/order_by.test 1.31 05/01/13 19:17:13 jimw@stripped +1 -1 add default value mysql-test/t/null.test 1.17 05/01/13 19:16:42 jimw@stripped +1 -1 Specify default values mysql-test/t/limit.test 1.8 05/01/13 19:14:57 jimw@stripped +1 -1 set default values mysql-test/t/gis-rtree.test 1.10 05/01/13 19:10:57 jimw@stripped +0 -1 Remove field that isn't used in test mysql-test/t/ctype_latin1_de.test 1.19 05/01/13 19:05:32 jimw@stripped +1 -1 Add defaults to avoid warnings mysql-test/t/ctype_many.test 1.20 05/01/13 19:04:25 jimw@stripped +3 -3 Add defaults to avoid warnings mysql-test/t/index_merge_ror.test 1.3 05/01/13 18:57:55 jimw@stripped +6 -6 Set default on columns to avoid warnings # 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: jimw # Host: rama.(none) # Root: /home/jimw/my/mysql-5.0-5986b --- 1.137/sql/sql_insert.cc 2005-01-13 17:51:45 -08:00 +++ 1.138/sql/sql_insert.cc 2005-01-14 11:32:23 -08:00 @@ -881,19 +881,20 @@ int check_that_all_fields_are_given_values(THD *thd, TABLE *entry) { - if (!thd->abort_on_warning) // No check if not strict mode - return 0; - + int err= 0; for (Field **field=entry->field ; *field ; field++) { if ((*field)->query_id != thd->query_id && ((*field)->flags & NO_DEFAULT_VALUE_FLAG)) { - my_error(ER_NO_DEFAULT_FOR_FIELD, MYF(0), (*field)->field_name); - return 1; + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_NO_DEFAULT_FOR_FIELD, + ER(ER_NO_DEFAULT_FOR_FIELD), + (*field)->field_name); + err= 1; } } - return 0; + return thd->abort_on_warning ? err : 0; } /***************************************************************************** --- 1.10/mysql-test/r/ctype_many.result 2004-10-02 12:19:56 -07:00 +++ 1.11/mysql-test/r/ctype_many.result 2005-01-14 11:28:58 -08:00 @@ -2,27 +2,27 @@ SET CHARACTER SET latin1; CREATE TABLE t1 ( comment CHAR(32) ASCII NOT NULL, -koi8_ru_f CHAR(32) CHARACTER SET koi8r NOT NULL +koi8_ru_f CHAR(32) CHARACTER SET koi8r NOT NULL default '' ) CHARSET=latin5; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) character set latin1 NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL + `koi8_ru_f` char(32) character set koi8r NOT NULL default '' ) ENGINE=MyISAM DEFAULT CHARSET=latin5 ALTER TABLE t1 CHANGE comment comment CHAR(32) CHARACTER SET latin2 NOT NULL; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) character set latin2 NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL + `koi8_ru_f` char(32) character set koi8r NOT NULL default '' ) ENGINE=MyISAM DEFAULT CHARSET=latin5 ALTER TABLE t1 ADD latin5_f CHAR(32) NOT NULL; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) character set latin2 NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL, + `koi8_ru_f` char(32) character set koi8r NOT NULL default '', `latin5_f` char(32) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin5 ALTER TABLE t1 DEFAULT CHARSET=latin2; @@ -31,7 +31,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL, + `koi8_ru_f` char(32) character set koi8r NOT NULL default '', `latin5_f` char(32) character set latin5 NOT NULL, `latin2_f` char(32) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin2 @@ -40,7 +40,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL + `koi8_ru_f` char(32) character set koi8r NOT NULL default '' ) ENGINE=MyISAM DEFAULT CHARSET=latin2 INSERT INTO t1 (koi8_ru_f,comment) VALUES ('a','LAT SMALL A'); INSERT INTO t1 (koi8_ru_f,comment) VALUES ('b','LAT SMALL B'); @@ -219,7 +219,7 @@ э CYR CAPIT E 2 ю CYR CAPIT YU 2 я CYR CAPIT YA 2 -ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 NOT NULL; +ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 NOT NULL default ''; UPDATE t1 SET utf8_f=CONVERT(koi8_ru_f USING utf8); SET CHARACTER SET koi8r; SELECT * FROM t1; @@ -340,7 +340,7 @@ CYR CAPIT E CYR CAPIT YU CYR CAPIT YA -ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL; +ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL default ''; UPDATE t1 SET bin_f=koi8_ru_f; SELECT COUNT(DISTINCT bin_f),COUNT(DISTINCT koi8_ru_f),COUNT(DISTINCT utf8_f) FROM t1; COUNT(DISTINCT bin_f) COUNT(DISTINCT koi8_ru_f) COUNT(DISTINCT utf8_f) --- 1.19/mysql-test/t/ctype_many.test 2004-03-20 02:29:40 -08:00 +++ 1.20/mysql-test/t/ctype_many.test 2005-01-13 19:04:25 -08:00 @@ -8,7 +8,7 @@ CREATE TABLE t1 ( comment CHAR(32) ASCII NOT NULL, - koi8_ru_f CHAR(32) CHARACTER SET koi8r NOT NULL + koi8_ru_f CHAR(32) CHARACTER SET koi8r NOT NULL default '' ) CHARSET=latin5; SHOW CREATE TABLE t1; @@ -142,13 +142,13 @@ SET CHARACTER SET utf8; SELECT koi8_ru_f,MIN(comment),COUNT(*) FROM t1 GROUP BY 1; -ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 NOT NULL; +ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 NOT NULL default ''; UPDATE t1 SET utf8_f=CONVERT(koi8_ru_f USING utf8); SET CHARACTER SET koi8r; SELECT * FROM t1; -ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL; +ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL default ''; UPDATE t1 SET bin_f=koi8_ru_f; SELECT COUNT(DISTINCT bin_f),COUNT(DISTINCT koi8_ru_f),COUNT(DISTINCT utf8_f) FROM t1; --- 1.80/mysql-test/r/create.result 2004-12-10 01:06:16 -08:00 +++ 1.81/mysql-test/r/create.result 2005-01-14 11:28:51 -08:00 @@ -255,11 +255,15 @@ create table t1 (a int not null, b int, primary key (a)); insert into t1 values (1,1); create table if not exists t1 select 2; +Warnings: +Warning 1364 Field 'a' doesn't have a default value select * from t1; a b 1 1 0 2 create table if not exists t1 select 3 as 'a',4 as 'b'; +Warnings: +Warning 1364 Field 'a' doesn't have a default value create table if not exists t1 select 3 as 'a',3 as 'b'; ERROR 23000: Duplicate entry '3' for key 1 select * from t1; --- 1.7/mysql-test/r/limit.result 2003-12-10 20:24:05 -08:00 +++ 1.8/mysql-test/r/limit.result 2005-01-14 11:29:56 -08:00 @@ -1,5 +1,5 @@ drop table if exists t1; -create table t1 (a int primary key, b int not null); +create table t1 (a int not null default 0 primary key, b int not null default 0); insert into t1 () values (); insert into t1 values (1,1),(2,1),(3,1); update t1 set a=4 where b=1 limit 1; --- 1.29/mysql-test/r/null.result 2004-12-07 05:46:55 -08:00 +++ 1.30/mysql-test/r/null.result 2005-01-14 11:30:00 -08:00 @@ -88,7 +88,7 @@ NULL this is null NULL this is null drop table t1; -CREATE TABLE t1 (a varchar(16) NOT NULL, b smallint(6) NOT NULL, c datetime NOT NULL, d smallint(6) NOT NULL); +CREATE TABLE t1 (a varchar(16) NOT NULL default '', b smallint(6) NOT NULL default '', c datetime NOT NULL default '0000-00-00 00:00:00', d smallint(6) NOT NULL default 0); INSERT INTO t1 SET a = "", d= "2003-01-14 03:54:55"; Warnings: Warning 1265 Data truncated for column 'd' at row 1 --- 1.46/mysql-test/r/order_by.result 2004-12-06 08:04:37 -08:00 +++ 1.47/mysql-test/r/order_by.result 2005-01-14 11:30:02 -08:00 @@ -257,7 +257,7 @@ favo_tv varchar(50) NOT NULL default '', favo_eten varchar(50) NOT NULL default '', favo_muziek varchar(30) NOT NULL default '', -info text NOT NULL, +info text NOT NULL default '', ipnr varchar(30) NOT NULL default '', PRIMARY KEY (member_id) ) ENGINE=MyISAM PACK_KEYS=1; --- 1.43/mysql-test/r/type_blob.result 2004-12-06 08:04:37 -08:00 +++ 1.44/mysql-test/r/type_blob.result 2005-01-14 11:30:17 -08:00 @@ -502,7 +502,7 @@ foobar boggle fish 10 drop table t1; -create table t1 (id integer auto_increment unique,imagem LONGBLOB not null); +create table t1 (id integer auto_increment unique,imagem LONGBLOB not null default ''); insert into t1 (id) values (1); select charset(load_file('../../std_data/words.dat')), --- 1.30/mysql-test/r/type_ranges.result 2004-12-10 01:06:17 -08:00 +++ 1.31/mysql-test/r/type_ranges.result 2005-01-14 11:30:22 -08:00 @@ -21,10 +21,10 @@ date_time datetime, blob_col blob, tinyblob_col tinyblob, -mediumblob_col mediumblob not null, -longblob_col longblob not null, -options enum('one','two','tree') not null, -flags set('one','two','tree') not null, +mediumblob_col mediumblob not null default '', +longblob_col longblob not null default '', +options enum('one','two','tree') not null , +flags set('one','two','tree') not null default '', PRIMARY KEY (auto), KEY (utiny), KEY (tiny), --- 1.7/mysql-test/t/limit.test 2003-12-17 07:35:29 -08:00 +++ 1.8/mysql-test/t/limit.test 2005-01-13 19:14:57 -08:00 @@ -6,7 +6,7 @@ drop table if exists t1; --enable_warnings -create table t1 (a int primary key, b int not null); +create table t1 (a int not null default 0 primary key, b int not null default 0); insert into t1 () values (); -- Testing default values insert into t1 values (1,1),(2,1),(3,1); update t1 set a=4 where b=1 limit 1; --- 1.16/mysql-test/t/null.test 2004-11-11 09:54:00 -08:00 +++ 1.17/mysql-test/t/null.test 2005-01-13 19:16:42 -08:00 @@ -59,7 +59,7 @@ # # Test inserting and updating with NULL # -CREATE TABLE t1 (a varchar(16) NOT NULL, b smallint(6) NOT NULL, c datetime NOT NULL, d smallint(6) NOT NULL); +CREATE TABLE t1 (a varchar(16) NOT NULL default '', b smallint(6) NOT NULL default '', c datetime NOT NULL default '0000-00-00 00:00:00', d smallint(6) NOT NULL default 0); INSERT INTO t1 SET a = "", d= "2003-01-14 03:54:55"; UPDATE t1 SET d=1/NULL; UPDATE t1 SET d=NULL; --- 1.30/mysql-test/t/order_by.test 2004-11-25 08:02:36 -08:00 +++ 1.31/mysql-test/t/order_by.test 2005-01-13 19:17:13 -08:00 @@ -206,7 +206,7 @@ favo_tv varchar(50) NOT NULL default '', favo_eten varchar(50) NOT NULL default '', favo_muziek varchar(30) NOT NULL default '', - info text NOT NULL, + info text NOT NULL default '', ipnr varchar(30) NOT NULL default '', PRIMARY KEY (member_id) ) ENGINE=MyISAM PACK_KEYS=1; --- 1.42/mysql-test/t/show_check.test 2005-01-08 13:22:39 -08:00 +++ 1.43/mysql-test/t/show_check.test 2005-01-13 19:19:32 -08:00 @@ -102,7 +102,7 @@ # Do a create table that tries to cover all types and options # create table t1 ( -type_bool bool not null, +type_bool bool not null default false, type_tiny tinyint not null auto_increment primary key, type_short smallint(3), type_mediumint mediumint, @@ -113,9 +113,9 @@ type_char char(2), type_varchar varchar(10), type_timestamp timestamp not null, -type_date date not null, -type_time time not null, -type_datetime datetime not null, +type_date date not null default '0000-00-00', +type_time time not null default '00:00:00', +type_datetime datetime not null default '0000-00-00 00:00:00', type_year year, type_enum enum ('red', 'green', 'blue'), type_set enum ('red', 'green', 'blue'), --- 1.25/mysql-test/t/type_blob.test 2005-01-04 03:46:43 -08:00 +++ 1.26/mysql-test/t/type_blob.test 2005-01-13 19:21:52 -08:00 @@ -301,7 +301,7 @@ # Bug when blob is updated # -create table t1 (id integer auto_increment unique,imagem LONGBLOB not null); +create table t1 (id integer auto_increment unique,imagem LONGBLOB not null default ''); insert into t1 (id) values (1); select charset(load_file('../../std_data/words.dat')), --- 1.10/mysql-test/t/type_ranges.test 2004-12-07 05:46:55 -08:00 +++ 1.11/mysql-test/t/type_ranges.test 2005-01-13 19:22:55 -08:00 @@ -28,10 +28,10 @@ date_time datetime, blob_col blob, tinyblob_col tinyblob, - mediumblob_col mediumblob not null, - longblob_col longblob not null, - options enum('one','two','tree') not null, - flags set('one','two','tree') not null, + mediumblob_col mediumblob not null default '', + longblob_col longblob not null default '', + options enum('one','two','tree') not null , + flags set('one','two','tree') not null default '', PRIMARY KEY (auto), KEY (utiny), KEY (tiny), --- 1.19/mysql-test/r/ctype_latin1_de.result 2004-10-28 05:44:55 -07:00 +++ 1.20/mysql-test/r/ctype_latin1_de.result 2005-01-14 11:28:54 -08:00 @@ -220,12 +220,12 @@ a test drop table t1; -create table t1 (word varchar(255) not null, word2 varchar(255) not null, index(word)); +create table t1 (word varchar(255) not null, word2 varchar(255) not null default '', index(word)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `word` varchar(255) collate latin1_german2_ci NOT NULL, - `word2` varchar(255) collate latin1_german2_ci NOT NULL, + `word2` varchar(255) collate latin1_german2_ci NOT NULL default '', KEY `word` (`word`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci insert into t1 (word) values ('ss'),(0xDF),(0xE4),('ae'); --- 1.18/mysql-test/t/ctype_latin1_de.test 2004-10-07 00:50:09 -07:00 +++ 1.19/mysql-test/t/ctype_latin1_de.test 2005-01-13 19:05:32 -08:00 @@ -66,7 +66,7 @@ # # The below checks both binary and character comparisons. # -create table t1 (word varchar(255) not null, word2 varchar(255) not null, index(word)); +create table t1 (word varchar(255) not null, word2 varchar(255) not null default '', index(word)); show create table t1; insert into t1 (word) values ('ss'),(0xDF),(0xE4),('ae'); update t1 set word2=word; --- 1.37/mysql-test/r/grant.result 2004-12-31 08:57:43 -08:00 +++ 1.38/mysql-test/r/grant.result 2005-01-14 11:29:44 -08:00 @@ -157,6 +157,10 @@ 1 1 insert into mysql.user (host, user) values ('localhost', 'test11'); +Warnings: +Warning 1364 Field 'ssl_cipher' doesn't have a default value +Warning 1364 Field 'x509_issuer' doesn't have a default value +Warning 1364 Field 'x509_subject' doesn't have a default value insert into mysql.db (host, db, user, select_priv) values ('localhost', 'a%', 'test11', 'Y'), ('localhost', 'ab%', 'test11', 'Y'); alter table mysql.db order by db asc; --- 1.4/mysql-test/r/help.result 2004-03-20 02:31:13 -08:00 +++ 1.5/mysql-test/r/help.result 2005-01-14 11:29:50 -08:00 @@ -1,32 +1,48 @@ insert into mysql.help_category(help_category_id,name)values(1,'impossible_category_1'); +Warnings: +Warning 1364 Field 'url' doesn't have a default value select @category1_id:= 1; @category1_id:= 1 1 insert into mysql.help_category(help_category_id,name)values(2,'impossible_category_2'); +Warnings: +Warning 1364 Field 'url' doesn't have a default value select @category2_id:= 2; @category2_id:= 2 2 insert into mysql.help_category(help_category_id,name,parent_category_id)values(3,'impossible_category_3',@category2_id); +Warnings: +Warning 1364 Field 'url' doesn't have a default value select @category3_id:= 3; @category3_id:= 3 3 insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(1,'impossible_function_1',@category1_id,'description of \n impossible_function1\n','example of \n impossible_function1'); +Warnings: +Warning 1364 Field 'url' doesn't have a default value select @topic1_id:= 1; @topic1_id:= 1 1 insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(2,'impossible_function_2',@category1_id,'description of \n impossible_function2\n','example of \n impossible_function2'); +Warnings: +Warning 1364 Field 'url' doesn't have a default value select @topic2_id:= 2; @topic2_id:= 2 2 insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(3,'impossible_function_3',@category2_id,'description of \n impossible_function3\n','example of \n impossible_function3'); +Warnings: +Warning 1364 Field 'url' doesn't have a default value select @topic3_id:= 3; @topic3_id:= 3 3 insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(4,'impossible_function_4',@category2_id,'description of \n impossible_function4\n','example of \n impossible_function4'); +Warnings: +Warning 1364 Field 'url' doesn't have a default value select @topic4_id:= 4; @topic4_id:= 4 4 insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(5,'impossible_function_7',@category3_id,'description of \n impossible_function5\n','example of \n impossible_function7'); +Warnings: +Warning 1364 Field 'url' doesn't have a default value select @topic5_id:= 5; @topic5_id:= 5 5 --- 1.13/mysql-test/r/strict.result 2005-01-13 17:53:05 -08:00 +++ 1.14/mysql-test/r/strict.result 2005-01-14 11:30:12 -08:00 @@ -912,7 +912,11 @@ Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'col1' at row 1 Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1 INSERT IGNORE INTO t1 (col1) values (3); +Warnings: +Warning 1364 Field 'col2' doesn't have a default value INSERT IGNORE INTO t1 () values (); +Warnings: +Warning 1364 Field 'col2' doesn't have a default value SELECT * FROM t1; col1 col2 1 hello @@ -942,6 +946,8 @@ SET @@sql_mode = ''; CREATE TABLE t1 (i int not null); INSERT INTO t1 VALUES (); +Warnings: +Warning 1364 Field 'i' doesn't have a default value INSERT INTO t1 VALUES (DEFAULT); Warnings: Warning 1364 Field 'i' doesn't have a default value @@ -949,6 +955,8 @@ ERROR HY000: Field 'i' doesn't have a default value ALTER TABLE t1 ADD j int; INSERT INTO t1 SET j = 1; +Warnings: +Warning 1364 Field 'i' doesn't have a default value INSERT INTO t1 SET j = 1, i = DEFAULT; Warnings: Warning 1364 Field 'i' doesn't have a default value --- 1.102/mysql-test/r/sp.result 2005-01-03 11:04:27 -08:00 +++ 1.103/mysql-test/r/sp.result 2005-01-14 11:30:08 -08:00 @@ -1,7 +1,7 @@ use test; drop table if exists t1; create table t1 ( -id char(16) not null, +id char(16) not null default '', data int not null ); drop table if exists t2; @@ -1725,7 +1725,7 @@ 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, + `id` char(16) NOT NULL default '', `data` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Database Create Database @@ -1778,7 +1778,7 @@ 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, + `id` char(16) NOT NULL default '', `data` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Database Create Database --- 1.97/mysql-test/t/sp.test 2005-01-04 03:46:43 -08:00 +++ 1.98/mysql-test/t/sp.test 2005-01-13 19:20:51 -08:00 @@ -11,7 +11,7 @@ drop table if exists t1; --enable_warnings create table t1 ( - id char(16) not null, + id char(16) not null default '', data int not null ); --disable_warnings --- 1.10/mysql-test/r/gis-rtree.result 2004-12-21 02:36:56 -08:00 +++ 1.11/mysql-test/r/gis-rtree.result 2005-01-14 11:29:40 -08:00 @@ -758,7 +758,6 @@ INSERT INTO t1 (g) VALUES (GeomFromText('LineString(1 2, 2 3)')),(GeomFromText('LineString(1 2, 2 4)')); drop table t1; CREATE TABLE t1 ( -geoobjid INT NOT NULL, line LINESTRING NOT NULL, kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po', name VARCHAR(32), --- 1.9/mysql-test/t/gis-rtree.test 2004-12-10 04:05:59 -08:00 +++ 1.10/mysql-test/t/gis-rtree.test 2005-01-13 19:10:57 -08:00 @@ -120,7 +120,6 @@ drop table t1; CREATE TABLE t1 ( - geoobjid INT NOT NULL, line LINESTRING NOT NULL, kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po', name VARCHAR(32), --- 1.27/mysql-test/r/rpl000001.result 2004-07-08 06:54:02 -07:00 +++ 1.28/mysql-test/r/rpl000001.result 2005-01-14 11:30:05 -08:00 @@ -76,6 +76,10 @@ insert into t1 values(3456); insert into mysql.user (Host, User, Password) VALUES ("10.10.10.%", "blafasel2", password("blafasel2")); +Warnings: +Warning 1364 Field 'ssl_cipher' doesn't have a default value +Warning 1364 Field 'x509_issuer' doesn't have a default value +Warning 1364 Field 'x509_subject' doesn't have a default value select select_priv,user from mysql.user where user = _binary'blafasel2'; select_priv user N blafasel2 --- 1.29/mysql-test/r/warnings.result 2004-10-02 12:19:56 -07:00 +++ 1.30/mysql-test/r/warnings.result 2005-01-14 11:30:26 -08:00 @@ -90,10 +90,12 @@ Warning 1265 Data truncated for column 'b' at row 4 insert into t2(b) values('mysqlab'); Warnings: +Warning 1364 Field 'a' doesn't have a default value Warning 1265 Data truncated for column 'b' at row 1 set sql_warnings=1; insert into t2(b) values('mysqlab'); Warnings: +Warning 1364 Field 'a' doesn't have a default value Warning 1265 Data truncated for column 'b' at row 1 set sql_warnings=0; drop table t1, t2; --- 1.16/mysql-test/r/grant2.result 2004-12-31 08:57:44 -08:00 +++ 1.17/mysql-test/r/grant2.result 2005-01-14 11:29:47 -08:00 @@ -225,6 +225,10 @@ % mysqltest_2 *BD447CBA355AF58578D3AE33BA2E2CD388BA08D1 localhost mysqltest_3 insert into mysql.user set host='%', user='mysqltest_B'; +Warnings: +Warning 1364 Field 'ssl_cipher' doesn't have a default value +Warning 1364 Field 'x509_issuer' doesn't have a default value +Warning 1364 Field 'x509_subject' doesn't have a default value create user mysqltest_A@'%'; ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'mysql' rename user mysqltest_B@'%' to mysqltest_C@'%'; --- 1.2/mysql-test/t/index_merge_ror.test 2004-05-28 15:03:57 -07:00 +++ 1.3/mysql-test/t/index_merge_ror.test 2005-01-13 18:57:55 -08:00 @@ -8,13 +8,13 @@ create table t1 ( /* Field names reflect value(rowid) distribution, st=STairs, swt= SaWTooth */ - st_a int not null, - swt1a int not null, - swt2a int not null, + st_a int not null default 0, + swt1a int not null default 0, + swt2a int not null default 0, - st_b int not null, - swt1b int not null, - swt2b int not null, + st_b int not null default 0, + swt1b int not null default 0, + swt2b int not null default 0, /* fields/keys for row retrieval tests */ key1 int,
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (jimw:1.1762) | jimw | 15 Jan |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.651 sec. using MySQL 5.1.14-beta-log