Skip to content

M
MariaDB
Commit 125cf485 authored by Elena Stepanova's avatar Elena Stepanova
Browse files
Options

Fixed engine test results in accordance with changes made in scope of 

commit 6b203426
parent 4e421687
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 7 deletions
mysql-test/suite/engines/funcs/r/jp_comment_older_compatibility1.result
View file @ 125cf485
...@@ -13,7 +13,7 @@ column_comment char_length(column_comment) ...@@ -13,7 +13,7 @@ column_comment char_length(column_comment)
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL DEFAULT '0' COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ', `c1` int(11) NOT NULL COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ',
`c12` int(11) DEFAULT NULL, `c12` int(11) DEFAULT NULL,
`c13` datetime DEFAULT NULL, `c13` datetime DEFAULT NULL,
`c14` char(10) DEFAULT NULL, `c14` char(10) DEFAULT NULL,
...@@ -40,7 +40,7 @@ column_comment char_length(column_comment) ...@@ -40,7 +40,7 @@ column_comment char_length(column_comment)
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL DEFAULT '0' COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ', `c1` int(11) NOT NULL COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ',
`c12` int(11) DEFAULT NULL, `c12` int(11) DEFAULT NULL,
`c13` datetime DEFAULT NULL, `c13` datetime DEFAULT NULL,
`c14` char(10) DEFAULT NULL, `c14` char(10) DEFAULT NULL,
...@@ -68,7 +68,7 @@ column_comment char_length(column_comment) ...@@ -68,7 +68,7 @@ column_comment char_length(column_comment)
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL DEFAULT '0' COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ', `c1` int(11) NOT NULL COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ',
`c12` int(11) DEFAULT NULL, `c12` int(11) DEFAULT NULL,
`c13` datetime DEFAULT NULL, `c13` datetime DEFAULT NULL,
`c14` char(10) DEFAULT NULL, `c14` char(10) DEFAULT NULL,
...@@ -96,7 +96,7 @@ column_comment char_length(column_comment) ...@@ -96,7 +96,7 @@ column_comment char_length(column_comment)
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL DEFAULT '0' COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ', `c1` int(11) NOT NULL COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ',
`c12` int(11) DEFAULT NULL, `c12` int(11) DEFAULT NULL,
`c13` datetime DEFAULT NULL, `c13` datetime DEFAULT NULL,
`c14` char(10) DEFAULT NULL, `c14` char(10) DEFAULT NULL,
...@@ -123,7 +123,7 @@ column_comment char_length(column_comment) ...@@ -123,7 +123,7 @@ column_comment char_length(column_comment)
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL DEFAULT '0' COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ', `c1` int(11) NOT NULL COMMENT 'あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ',
`c12` int(11) DEFAULT NULL, `c12` int(11) DEFAULT NULL,
`c13` datetime DEFAULT NULL, `c13` datetime DEFAULT NULL,
`c14` char(10) DEFAULT NULL, `c14` char(10) DEFAULT NULL,
......
mysql-test/suite/engines/iuds/r/insert_number.result
View file @ 125cf485
...@@ -1374,6 +1374,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38); ...@@ -1374,6 +1374,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38);
INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37); INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37);
INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID()); INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID());
INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID()); INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID());
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22); INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings: Warnings:
Warning 1366 Incorrect integer value: '' for column 'c1' at row 1 Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
...@@ -2389,6 +2391,7 @@ DROP TABLE t6,t7,t8; ...@@ -2389,6 +2391,7 @@ DROP TABLE t6,t7,t8;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
Warnings: Warnings:
Warning 1364 Field 'c1' doesn't have a default value Warning 1364 Field 'c1' doesn't have a default value
Warning 1364 Field 'c6' doesn't have a default value
SET SQL_MODE=STRICT_ALL_TABLES; SET SQL_MODE=STRICT_ALL_TABLES;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
ERROR HY000: Field 'c1' doesn't have a default value ERROR HY000: Field 'c1' doesn't have a default value
...@@ -6977,6 +6980,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38); ...@@ -6977,6 +6980,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38);
INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37); INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37);
INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID()); INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID());
INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID()); INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID());
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22); INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings: Warnings:
Warning 1366 Incorrect integer value: '' for column 'c1' at row 1 Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
...@@ -7981,6 +7986,7 @@ DROP TABLE t6,t7,t8; ...@@ -7981,6 +7986,7 @@ DROP TABLE t6,t7,t8;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
Warnings: Warnings:
Warning 1364 Field 'c1' doesn't have a default value Warning 1364 Field 'c1' doesn't have a default value
Warning 1364 Field 'c6' doesn't have a default value
SET SQL_MODE=STRICT_ALL_TABLES; SET SQL_MODE=STRICT_ALL_TABLES;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
ERROR HY000: Field 'c1' doesn't have a default value ERROR HY000: Field 'c1' doesn't have a default value
...@@ -12674,6 +12680,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38); ...@@ -12674,6 +12680,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38);
INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37); INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37);
INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID()); INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID());
INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID()); INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID());
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22); INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings: Warnings:
Warning 1366 Incorrect integer value: '' for column 'c1' at row 1 Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
...@@ -13678,6 +13686,7 @@ DROP TABLE t6,t7,t8; ...@@ -13678,6 +13686,7 @@ DROP TABLE t6,t7,t8;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
Warnings: Warnings:
Warning 1364 Field 'c1' doesn't have a default value Warning 1364 Field 'c1' doesn't have a default value
Warning 1364 Field 'c6' doesn't have a default value
SET SQL_MODE=STRICT_ALL_TABLES; SET SQL_MODE=STRICT_ALL_TABLES;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
ERROR HY000: Field 'c1' doesn't have a default value ERROR HY000: Field 'c1' doesn't have a default value
...@@ -18476,6 +18485,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38); ...@@ -18476,6 +18485,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38);
INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37); INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37);
INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID()); INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID());
INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID()); INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID());
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22); INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings: Warnings:
Warning 1366 Incorrect integer value: '' for column 'c1' at row 1 Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
...@@ -19480,6 +19491,7 @@ DROP TABLE t6,t7,t8; ...@@ -19480,6 +19491,7 @@ DROP TABLE t6,t7,t8;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
Warnings: Warnings:
Warning 1364 Field 'c1' doesn't have a default value Warning 1364 Field 'c1' doesn't have a default value
Warning 1364 Field 'c6' doesn't have a default value
SET SQL_MODE=STRICT_ALL_TABLES; SET SQL_MODE=STRICT_ALL_TABLES;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
ERROR HY000: Field 'c1' doesn't have a default value ERROR HY000: Field 'c1' doesn't have a default value
...@@ -24383,6 +24395,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38); ...@@ -24383,6 +24395,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38);
INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37); INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37);
INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID()); INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID());
INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID()); INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID());
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22); INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings: Warnings:
Warning 1366 Incorrect integer value: '' for column 'c1' at row 1 Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
...@@ -25387,6 +25401,7 @@ DROP TABLE t6,t7,t8; ...@@ -25387,6 +25401,7 @@ DROP TABLE t6,t7,t8;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
Warnings: Warnings:
Warning 1364 Field 'c1' doesn't have a default value Warning 1364 Field 'c1' doesn't have a default value
Warning 1364 Field 'c6' doesn't have a default value
SET SQL_MODE=STRICT_ALL_TABLES; SET SQL_MODE=STRICT_ALL_TABLES;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
ERROR HY000: Field 'c1' doesn't have a default value ERROR HY000: Field 'c1' doesn't have a default value
...@@ -30290,6 +30305,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38); ...@@ -30290,6 +30305,8 @@ INSERT INTO t4 VALUES(0,32,33,34,35,36,37,38);
INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37); INSERT INTO t5 VALUES(0,-32,-32,33,34,35,36,37);
INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID()); INSERT INTO t4(c1,c3,c4) VALUES(NULL,104,LAST_INSERT_ID());
INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID()); INSERT INTO t5(c1,c3,c4) VALUES(NULL,-104,LAST_INSERT_ID());
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22); INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings: Warnings:
Warning 1366 Incorrect integer value: '' for column 'c1' at row 1 Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
...@@ -31294,6 +31311,7 @@ DROP TABLE t6,t7,t8; ...@@ -31294,6 +31311,7 @@ DROP TABLE t6,t7,t8;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
Warnings: Warnings:
Warning 1364 Field 'c1' doesn't have a default value Warning 1364 Field 'c1' doesn't have a default value
Warning 1364 Field 'c6' doesn't have a default value
SET SQL_MODE=STRICT_ALL_TABLES; SET SQL_MODE=STRICT_ALL_TABLES;
INSERT INTO t2 SET c3=5,c4=6; INSERT INTO t2 SET c3=5,c4=6;
ERROR HY000: Field 'c1' doesn't have a default value ERROR HY000: Field 'c1' doesn't have a default value
......
mysql-test/suite/engines/iuds/r/insert_year.result
View file @ 125cf485
...@@ -36,6 +36,8 @@ Warning 1265 Data truncated for column 'c2' at row 1 ...@@ -36,6 +36,8 @@ Warning 1265 Data truncated for column 'c2' at row 1
Note 1265 Data truncated for column 'c3' at row 1 Note 1265 Data truncated for column 'c3' at row 1
INSERT INTO t1(c1) VALUES('5'); INSERT INTO t1(c1) VALUES('5');
INSERT INTO t2(c1) VALUES('5'); INSERT INTO t2(c1) VALUES('5');
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t3(c1) VALUES('5'); INSERT INTO t3(c1) VALUES('5');
INSERT INTO t4(c1,c2) VALUES('0','000'); INSERT INTO t4(c1,c2) VALUES('0','000');
INSERT INTO t2 VALUES(1900,2156,'08-01-06','08/01/07'); INSERT INTO t2 VALUES(1900,2156,'08-01-06','08/01/07');
...@@ -3218,6 +3220,8 @@ TRUNCATE TABLE t5; ...@@ -3218,6 +3220,8 @@ TRUNCATE TABLE t5;
DROP TABLE t5; DROP TABLE t5;
INSERT INTO t1 SET c1='00'; INSERT INTO t1 SET c1='00';
INSERT INTO t2 SET c1=69; INSERT INTO t2 SET c1=69;
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t3 SET c1=70; INSERT INTO t3 SET c1=70;
INSERT INTO t4 SET c2=99; INSERT INTO t4 SET c2=99;
Warnings: Warnings:
...@@ -3291,6 +3295,8 @@ Warning 1265 Data truncated for column 'c2' at row 1 ...@@ -3291,6 +3295,8 @@ Warning 1265 Data truncated for column 'c2' at row 1
Note 1265 Data truncated for column 'c3' at row 1 Note 1265 Data truncated for column 'c3' at row 1
INSERT INTO t1(c1) VALUES('5'); INSERT INTO t1(c1) VALUES('5');
INSERT INTO t2(c1) VALUES('5'); INSERT INTO t2(c1) VALUES('5');
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t3(c1) VALUES('5'); INSERT INTO t3(c1) VALUES('5');
INSERT INTO t4(c1,c2) VALUES('0','000'); INSERT INTO t4(c1,c2) VALUES('0','000');
INSERT INTO t2 VALUES(1900,2156,'08-01-06','08/01/07'); INSERT INTO t2 VALUES(1900,2156,'08-01-06','08/01/07');
...@@ -6183,6 +6189,8 @@ TRUNCATE TABLE t5; ...@@ -6183,6 +6189,8 @@ TRUNCATE TABLE t5;
DROP TABLE t5; DROP TABLE t5;
INSERT INTO t1 SET c1='00'; INSERT INTO t1 SET c1='00';
INSERT INTO t2 SET c1=69; INSERT INTO t2 SET c1=69;
Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t3 SET c1=70; INSERT INTO t3 SET c1=70;
INSERT INTO t4 SET c2=99; INSERT INTO t4 SET c2=99;
Warnings: Warnings:
......
mysql-test/suite/engines/iuds/r/update_decimal.result
View file @ 125cf485
...@@ -348,7 +348,7 @@ c3 ...@@ -348,7 +348,7 @@ c3
9999999999 9999999999
UPDATE t1 SET c2="1 e 1" WHERE c4=2; UPDATE t1 SET c2="1 e 1" WHERE c4=2;
Warnings: Warnings:
Note 1265 Data truncated for column 'c2' at row 2 Warning 1265 Data truncated for column 'c2' at row 2
SELECT c2 FROM t1; SELECT c2 FROM t1;
c2 c2
-100.00000 -100.00000
...@@ -1099,7 +1099,7 @@ INSERT INTO t3 VALUES ('11111.11111','4444444444',1),('55555.55555','5555555555' ...@@ -1099,7 +1099,7 @@ INSERT INTO t3 VALUES ('11111.11111','4444444444',1),('55555.55555','5555555555'
UPDATE t2,t3 SET t3.c1='22222.22222' WHERE t2.c1=t3.c1 AND t2.c3=t3.c3; UPDATE t2,t3 SET t3.c1='22222.22222' WHERE t2.c1=t3.c1 AND t2.c3=t3.c3;
UPDATE t1 SET c3='asdf' WHERE c1='11111.11111'; UPDATE t1 SET c3='asdf' WHERE c1='11111.11111';
Warnings: Warnings:
Warning 1265 Data truncated for column 'c3' at row 1 Warning 1366 Incorrect double value: 'asdf' for column 'c3' at row 1
SELECT c3 FROM t1; SELECT c3 FROM t1;
c3 c3
0 0
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7