1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upmerge for changes in mysql-5.1 - #33971

Browse Source
This commit is contained in:
Sandeep Doddaballapur 2011-01-31 14:33:26 +05:30
commit fe5d0856b9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/csv_not_null.result
View File

@ -19,13 +19,16 @@ INSERT INTO t1 VALUES();
SELECT * FROM t1; SELECT * FROM t1;
a b c d e f a b c d e f
0 foo 0000-00-00 0 foo 0000-00-00
INSERT INTO t1 VALUES(default,default,default,default,default,default);
SELECT * FROM t1; SELECT * FROM t1;
a b c d e f a b c d e f
0 foo 0000-00-00 0 foo 0000-00-00
0 foo 0000-00-00
INSERT INTO t1 VALUES(0,'abc','def','ghi','bar','1999-12-31'); INSERT INTO t1 VALUES(0,'abc','def','ghi','bar','1999-12-31');
SELECT * FROM t1; SELECT * FROM t1;
a b c d e f a b c d e f
0 foo 0000-00-00 0 foo 0000-00-00
0 foo 0000-00-00
0 abc def ghi bar 1999-12-31 0 abc def ghi bar 1999-12-31
# === insert failures === # === insert failures ===
INSERT INTO t1 VALUES(NULL,'ab','a','b','foo','2007-01-01'); INSERT INTO t1 VALUES(NULL,'ab','a','b','foo','2007-01-01');

6
mysql-test/t/csv_not_null.test
View File

@ -55,10 +55,8 @@ INSERT INTO t1 VALUES();
SELECT * FROM t1; SELECT * FROM t1;
-- disable_warnings -- disable_warnings
# NOTE - Test disabled due to enum crash for this INSERT # Bug#33717 - INSERT...(default) fails for enum.
# See Bug#33717 - INSERT...(default) fails for enum. INSERT INTO t1 VALUES(default,default,default,default,default,default);
# Crashes CSV tables, loads spaces for MyISAM
#INSERT INTO t1 VALUES(default,default,default,default,default,default);
-- enable_warnings -- enable_warnings
SELECT * FROM t1; SELECT * FROM t1;