Skip to content

Commit

Permalink
MDEV-14576 Include full name of object in message about incorrect val…
Browse files Browse the repository at this point in the history 
…ue for column

update engines/ suites

followup for c4ab352
  • Loading branch information
@vuvova
vuvova committed Dec 21, 2018
1 parent 37b1b06 commit 2cf3086
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 130 deletions.
12 changes: 6 additions & 6 deletions mysql-test/suite/engines/funcs/r/in_number_boundary_error.result
View file
Expand Up @@ -7,7 +7,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
Expand All @@ -26,7 +26,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
Expand All @@ -45,7 +45,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
Expand All @@ -64,7 +64,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
Expand All @@ -83,7 +83,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
Expand All @@ -102,7 +102,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
Expand Down
8 changes: 4 additions & 4 deletions mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result
View file
Expand Up @@ -7,7 +7,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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);
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5;
Expand All @@ -27,7 +27,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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);
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5;
Expand All @@ -47,7 +47,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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);
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5;
Expand All @@ -67,7 +67,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
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);
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5;
Expand Down
12 changes: 6 additions & 6 deletions mysql-test/suite/engines/iuds/r/insert_decimal.result
View file
Expand Up @@ -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 'c2' 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 '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`.`c1` 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 `test`.`t2`.`c3` at row 2
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 '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 '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`.`c1` 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 `test`.`t2`.`c3` at row 4
SELECT * FROM t1;
c1 c2 c3 c4
0.00000 -0.10000 0 13
Expand Down

0 comments on commit 2cf3086

Please sign in to comment.