Commit d89b85c2 authored by Sandeep Doddaballapur's avatar Sandeep Doddaballapur

upmerge for changes in mysql-5.1 - #33971

parents 3c5d22af 104df947
...@@ -19,13 +19,16 @@ INSERT INTO t1 VALUES(); ...@@ -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');
......
...@@ -55,10 +55,8 @@ INSERT INTO t1 VALUES(); ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment