Skip to content

M
MariaDB
Commit 2cf30866 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

MDEV-14576 Include full name of object in message about incorrect value for column 

update engines/ suites

followup for c4ab352b
parent 37b1b065
Expand all Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 130 deletions
mysql-test/suite/engines/funcs/r/in_number_boundary_error.result
View file @ 2cf30866
...@@ -7,7 +7,7 @@ INSERT INTO t4 (c1) VALUES(0); ...@@ -7,7 +7,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1); INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x'); INSERT INTO t4 (c1) VALUES('x');
ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9'); INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4; SELECT COUNT(c1) AS total_rows FROM t4;
total_rows total_rows
...@@ -26,7 +26,7 @@ INSERT INTO t4 (c1) VALUES(0); ...@@ -26,7 +26,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1); INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x'); INSERT INTO t4 (c1) VALUES('x');
ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9'); INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4; SELECT COUNT(c1) AS total_rows FROM t4;
total_rows total_rows
...@@ -45,7 +45,7 @@ INSERT INTO t4 (c1) VALUES(0); ...@@ -45,7 +45,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1); INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x'); INSERT INTO t4 (c1) VALUES('x');
ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9'); INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4; SELECT COUNT(c1) AS total_rows FROM t4;
total_rows total_rows
...@@ -64,7 +64,7 @@ INSERT INTO t4 (c1) VALUES(0); ...@@ -64,7 +64,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1); INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x'); INSERT INTO t4 (c1) VALUES('x');
ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9'); INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4; SELECT COUNT(c1) AS total_rows FROM t4;
total_rows total_rows
...@@ -83,7 +83,7 @@ INSERT INTO t4 (c1) VALUES(0); ...@@ -83,7 +83,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1); INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x'); INSERT INTO t4 (c1) VALUES('x');
ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9'); INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4; SELECT COUNT(c1) AS total_rows FROM t4;
total_rows total_rows
...@@ -102,7 +102,7 @@ INSERT INTO t4 (c1) VALUES(0); ...@@ -102,7 +102,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1); INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x'); INSERT INTO t4 (c1) VALUES('x');
ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9'); INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4; SELECT COUNT(c1) AS total_rows FROM t4;
total_rows total_rows
......
mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result
View file @ 2cf30866
...@@ -7,7 +7,7 @@ INSERT INTO t5 (c1) VALUES(0); ...@@ -7,7 +7,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1); INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t5 (c1) VALUES('x'); INSERT INTO t5 (c1) VALUES('x');
ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t5`.`c1` at row 1
INSERT INTO t5 (c1) VALUES(999999); INSERT INTO t5 (c1) VALUES(999999);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5; SELECT COUNT(c1) AS total_rows FROM t5;
...@@ -27,7 +27,7 @@ INSERT INTO t5 (c1) VALUES(0); ...@@ -27,7 +27,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1); INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t5 (c1) VALUES('x'); INSERT INTO t5 (c1) VALUES('x');
ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t5`.`c1` at row 1
INSERT INTO t5 (c1) VALUES(999999); INSERT INTO t5 (c1) VALUES(999999);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5; SELECT COUNT(c1) AS total_rows FROM t5;
...@@ -47,7 +47,7 @@ INSERT INTO t5 (c1) VALUES(0); ...@@ -47,7 +47,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1); INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t5 (c1) VALUES('x'); INSERT INTO t5 (c1) VALUES('x');
ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t5`.`c1` at row 1
INSERT INTO t5 (c1) VALUES(999999); INSERT INTO t5 (c1) VALUES(999999);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5; SELECT COUNT(c1) AS total_rows FROM t5;
...@@ -67,7 +67,7 @@ INSERT INTO t5 (c1) VALUES(0); ...@@ -67,7 +67,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1); INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t5 (c1) VALUES('x'); INSERT INTO t5 (c1) VALUES('x');
ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1 ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t5`.`c1` at row 1
INSERT INTO t5 (c1) VALUES(999999); INSERT INTO t5 (c1) VALUES(999999);
ERROR 22003: Out of range value for column 'c1' at row 1 ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5; SELECT COUNT(c1) AS total_rows FROM t5;
......
mysql-test/suite/engines/iuds/r/insert_decimal.result
View file @ 2cf30866
...@@ -110,15 +110,15 @@ Warnings: ...@@ -110,15 +110,15 @@ Warnings:
Warning 1264 Out of range value for column 'c1' at row 1 Warning 1264 Out of range value for column 'c1' at row 1
Warning 1264 Out of range value for column 'c2' at row 1 Warning 1264 Out of range value for column 'c2' at row 1
Warning 1264 Out of range value for column 'c3' at row 1 Warning 1264 Out of range value for column 'c3' at row 1
Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'c1' at row 2 Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t2`.`c1` at row 2
Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'c2' at row 2 Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t2`.`c2` at row 2
Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'c3' at row 2 Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t2`.`c3` at row 2
Note 1265 Data truncated for column 'c1' at row 3 Note 1265 Data truncated for column 'c1' at row 3
Note 1265 Data truncated for column 'c2' at row 3 Note 1265 Data truncated for column 'c2' at row 3
Note 1265 Data truncated for column 'c3' at row 3 Note 1265 Data truncated for column 'c3' at row 3
Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'c1' at row 4 Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t2`.`c1` at row 4
Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'c2' at row 4 Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t2`.`c2` at row 4
Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'c3' at row 4 Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t2`.`c3` at row 4
SELECT * FROM t1; SELECT * FROM t1;
c1 c2 c3 c4 c1 c2 c3 c4
0.00000 -0.10000 0 13 0.00000 -0.10000 0 13
......
mysql-test/suite/engines/iuds/r/insert_year.result
View file @ 2cf30866
...@@ -60,12 +60,12 @@ Warning 1264 Out of range value for column 'c1' at row 6 ...@@ -60,12 +60,12 @@ Warning 1264 Out of range value for column 'c1' at row 6
Warning 1264 Out of range value for column 'c2' at row 6 Warning 1264 Out of range value for column 'c2' at row 6
INSERT IGNORE INTO t1 VALUES('','','08-01-04','08/01/05') /* Inserts zero dates for '' strings */; INSERT IGNORE INTO t1 VALUES('','','08-01-04','08/01/05') /* Inserts zero dates for '' strings */;
Warnings: Warnings:
Warning 1366 Incorrect integer value: '' for column 'c1' at row 1 Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
Warning 1366 Incorrect integer value: '' for column 'c2' at row 1 Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT IGNORE INTO t4 VALUES('abcd','abcd','08-01-10','08/01/11'),(1234,1234,'08-01-12','08/01/13') /* Inserts zero dates for absurd dates */; INSERT IGNORE INTO t4 VALUES('abcd','abcd','08-01-10','08/01/11'),(1234,1234,'08-01-12','08/01/13') /* Inserts zero dates for absurd dates */;
Warnings: Warnings:
Warning 1366 Incorrect integer value: 'abcd' for column 'c1' at row 1 Warning 1366 Incorrect integer value: 'abcd' for column `test`.`t4`.`c1` at row 1
Warning 1366 Incorrect integer value: 'abcd' for column 'c2' at row 1 Warning 1366 Incorrect integer value: 'abcd' for column `test`.`t4`.`c2` at row 1
Warning 1264 Out of range value for column 'c1' at row 2 Warning 1264 Out of range value for column 'c1' at row 2
Warning 1264 Out of range value for column 'c2' at row 2 Warning 1264 Out of range value for column 'c2' at row 2
INSERT INTO t2 VALUES('20','30','98-12-16','98.12.16 11:30:45'),('40','20','98-12-15','98.12.15 11:30:45'); INSERT INTO t2 VALUES('20','30','98-12-16','98.12.16 11:30:45'),('40','20','98-12-15','98.12.15 11:30:45');
...@@ -3319,12 +3319,12 @@ Warning 1264 Out of range value for column 'c1' at row 6 ...@@ -3319,12 +3319,12 @@ Warning 1264 Out of range value for column 'c1' at row 6
Warning 1264 Out of range value for column 'c2' at row 6 Warning 1264 Out of range value for column 'c2' at row 6
INSERT IGNORE INTO t1 VALUES('','','08-01-04','08/01/05') /* Inserts zero dates for '' strings */; INSERT IGNORE INTO t1 VALUES('','','08-01-04','08/01/05') /* Inserts zero dates for '' strings */;
Warnings: Warnings:
Warning 1366 Incorrect integer value: '' for column 'c1' at row 1 Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
Warning 1366 Incorrect integer value: '' for column 'c2' at row 1 Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT IGNORE INTO t4 VALUES('abcd','abcd','08-01-10','08/01/11'),(1234,1234,'08-01-12','08/01/13') /* Inserts zero dates for absurd dates */; INSERT IGNORE INTO t4 VALUES('abcd','abcd','08-01-10','08/01/11'),(1234,1234,'08-01-12','08/01/13') /* Inserts zero dates for absurd dates */;
Warnings: Warnings:
Warning 1366 Incorrect integer value: 'abcd' for column 'c1' at row 1 Warning 1366 Incorrect integer value: 'abcd' for column `test`.`t4`.`c1` at row 1
Warning 1366 Incorrect integer value: 'abcd' for column 'c2' at row 1 Warning 1366 Incorrect integer value: 'abcd' for column `test`.`t4`.`c2` at row 1
Warning 1264 Out of range value for column 'c1' at row 2 Warning 1264 Out of range value for column 'c1' at row 2
Warning 1264 Out of range value for column 'c2' at row 2 Warning 1264 Out of range value for column 'c2' at row 2
INSERT INTO t2 VALUES('20','30','98-12-16','98.12.16 11:30:45'),('40','20','98-12-15','98.12.15 11:30:45'); INSERT INTO t2 VALUES('20','30','98-12-16','98.12.16 11:30:45'),('40','20','98-12-15','98.12.15 11:30:45');
......
mysql-test/suite/engines/iuds/r/update_decimal.result
View file @ 2cf30866
...@@ -334,7 +334,7 @@ INSERT INTO t3 VALUES ('11111.11111','4444444444',1),('55555.55555','5555555555' ...@@ -334,7 +334,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 IGNORE t1 SET c3='asdf' WHERE c1='11111.11111'; UPDATE IGNORE t1 SET c3='asdf' WHERE c1='11111.11111';
Warnings: Warnings:
Warning 1366 Incorrect decimal value: 'asdf' for column 'c3' at row 1 Warning 1366 Incorrect decimal value: 'asdf' for column `test`.`t1`.`c3` at row 1
SELECT c3 FROM t1; SELECT c3 FROM t1;
c3 c3
0 0
...@@ -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 IGNORE t1 SET c3='asdf' WHERE c1='11111.11111'; UPDATE IGNORE t1 SET c3='asdf' WHERE c1='11111.11111';
Warnings: Warnings:
Warning 1366 Incorrect double value: 'asdf' for column 'c3' at row 1 Warning 1366 Incorrect double value: 'asdf' for column `test`.`t1`.`c3` at row 1
SELECT c3 FROM t1; SELECT c3 FROM t1;
c3 c3
0 0
......
storage/tokudb/mysql-test/tokudb/disabled.def
View file @ 2cf30866
...@@ -30,5 +30,5 @@ i_s_tokudb_lock_waits_released: unstable, race conditions ...@@ -30,5 +30,5 @@ i_s_tokudb_lock_waits_released: unstable, race conditions
i_s_tokudb_locks_released: unstable, race conditions i_s_tokudb_locks_released: unstable, race conditions
row_format: n/a row_format: n/a
nonflushing_analyze_debug: Freezes in MariaDB 10.0 nonflushing_analyze_debug: Freezes in MariaDB 10.0
tokudb.change_column_all_1000_1: We are too lazy to fix this properly change_column_all_1000_1: We are too lazy to fix this properly
tokudb.change_column_all_1000_10: We are too lazy to fix this properly change_column_all_1000_10: We are too lazy to fix this properly
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