diff options
| author | Sandeep Doddaballapur <sandeep.doddaballapur@sun.com> | 2011-01-31 14:33:26 +0530 |
|---|---|---|
| committer | Sandeep Doddaballapur <sandeep.doddaballapur@sun.com> | 2011-01-31 14:33:26 +0530 |
| commit | 04ebd225532129d4ad19c883a677d95c7df3cbcc (patch) | |
| tree | ac798bb70d81a38ed96d775273d6df15beaa0319 | |
| parent | 85aa10f59cb222cb23580d7c8263b5eb4fc922bc (diff) | |
| parent | f6258063c6d85375b7044302cb96650522096743 (diff) | |
| download | mariadb-git-04ebd225532129d4ad19c883a677d95c7df3cbcc.tar.gz | |
upmerge for changes in mysql-5.1 - #33971
| -rw-r--r-- | mysql-test/r/csv_not_null.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/csv_not_null.test | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/csv_not_null.result b/mysql-test/r/csv_not_null.result index af583a36837..aed9bcb1587 100644 --- a/mysql-test/r/csv_not_null.result +++ b/mysql-test/r/csv_not_null.result @@ -19,13 +19,16 @@ INSERT INTO t1 VALUES(); SELECT * FROM t1; a b c d e f 0 foo 0000-00-00 +INSERT INTO t1 VALUES(default,default,default,default,default,default); SELECT * FROM t1; a b c d e f 0 foo 0000-00-00 +0 foo 0000-00-00 INSERT INTO t1 VALUES(0,'abc','def','ghi','bar','1999-12-31'); SELECT * FROM t1; a b c d e f 0 foo 0000-00-00 +0 foo 0000-00-00 0 abc def ghi bar 1999-12-31 # === insert failures === INSERT INTO t1 VALUES(NULL,'ab','a','b','foo','2007-01-01'); diff --git a/mysql-test/t/csv_not_null.test b/mysql-test/t/csv_not_null.test index 03ed566fb22..bebea53b2f7 100644 --- a/mysql-test/t/csv_not_null.test +++ b/mysql-test/t/csv_not_null.test @@ -55,10 +55,8 @@ INSERT INTO t1 VALUES(); SELECT * FROM t1; -- disable_warnings -# NOTE - Test disabled due to enum crash for this INSERT -# See Bug#33717 - INSERT...(default) fails for enum. -# Crashes CSV tables, loads spaces for MyISAM -#INSERT INTO t1 VALUES(default,default,default,default,default,default); +# Bug#33717 - INSERT...(default) fails for enum. +INSERT INTO t1 VALUES(default,default,default,default,default,default); -- enable_warnings SELECT * FROM t1; |