diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2018-12-16 02:21:41 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2018-12-16 02:21:41 +0400 |
| commit | c4ab352b670618bb478138cfbf3ed195317b3ccb (patch) | |
| tree | 3dc86ad7d504865798871ae869ab5bac40e804b2 /storage/tokudb/mysql-test/tokudb/r | |
| parent | 0a2edddbf4f4737863edf51970cbbaa91e72e11f (diff) | |
| download | mariadb-git-c4ab352b670618bb478138cfbf3ed195317b3ccb.tar.gz | |
MDEV-14576 Include full name of object in message about incorrect value for column.
The error message modified.
Then the TABLE_SHARE::error_table_name() implementation taken from 10.3,
to be used as a name of the table in this message.
Diffstat (limited to 'storage/tokudb/mysql-test/tokudb/r')
5 files changed, 9 insertions, 9 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_date.result b/storage/tokudb/mysql-test/tokudb/r/type_date.result index 047dc6dc777..70281843ac6 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_date.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_date.result @@ -100,7 +100,7 @@ DROP TABLE t1, t2, t3; CREATE TABLE t1 (y YEAR); INSERT INTO t1 VALUES ('abc'); Warnings: -Warning 1366 Incorrect integer value: 'abc' for column 'y' at row 1 +Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`y` at row 1 SELECT * FROM t1; y 0000 @@ -211,7 +211,7 @@ a 0000-00-00 0000-00-00 INSERT INTO t1 VALUES ('0000-00-00'); -ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1 +ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`a` at row 1 SET SQL_MODE=DEFAULT; DROP TABLE t1,t2; CREATE TABLE t1 (a DATE); @@ -240,7 +240,7 @@ a 1000-00-00 1000-00-00 INSERT INTO t1 VALUES ('1000-00-00'); -ERROR 22007: Incorrect date value: '1000-00-00' for column 'a' at row 1 +ERROR 22007: Incorrect date value: '1000-00-00' for column `test`.`t1`.`a` at row 1 SET SQL_MODE=DEFAULT; DROP TABLE t1,t2; CREATE TABLE t1 SELECT curdate() AS f1; diff --git a/storage/tokudb/mysql-test/tokudb/r/type_datetime.result b/storage/tokudb/mysql-test/tokudb/r/type_datetime.result index 80f886683e7..ed980f8cee1 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_datetime.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_datetime.result @@ -218,7 +218,7 @@ insert into t1 set dt='2007-03-23 13:49:38',da=dt; Warnings: Note 1265 Data truncated for column 'da' at row 1 insert into t1 values ('2007-03-32','2007-03-23 13:49:38'); -ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1 +ERROR 22007: Incorrect date value: '2007-03-32' for column `test`.`t1`.`da` at row 1 select * from t1; da dt 1962-03-03 1962-03-03 00:00:00 @@ -586,7 +586,7 @@ insert into t1 set dt='2007-03-23 13:49:38',da=dt; Warnings: Note 1265 Data truncated for column 'da' at row 1 insert into t1 values ('2007-03-32','2007-03-23 13:49:38'); -ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1 +ERROR 22007: Incorrect date value: '2007-03-32' for column `test`.`t1`.`da` at row 1 select * from t1; da dt 1962-03-03 1962-03-03 00:00:00 diff --git a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result index afea1736a5a..3b82bbcef4f 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result @@ -177,9 +177,9 @@ Note 1265 Data truncated for column 'a' at row 2 insert into t1 values ("1e+18446744073709551615"),("1e+18446744073709551616"),("1e-9223372036854775807"),("1e-9223372036854775809"); Warnings: Warning 1264 Out of range value for column 'a' at row 1 -Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'a' at row 2 +Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t1`.`a` at row 2 Note 1265 Data truncated for column 'a' at row 3 -Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'a' at row 4 +Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t1`.`a` at row 4 insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0"); Warnings: Warning 1265 Data truncated for column 'a' at row 1 diff --git a/storage/tokudb/mysql-test/tokudb/r/type_float.result b/storage/tokudb/mysql-test/tokudb/r/type_float.result index 6387cea5384..3bfda535e87 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_float.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_float.result @@ -459,7 +459,7 @@ Warnings: Warning 1265 Data truncated for column 'f' at row 1 INSERT INTO t1 VALUES ('.'); Warnings: -Warning 1366 Incorrect double value: '.' for column 'f' at row 1 +Warning 1366 Incorrect double value: '.' for column `test`.`t1`.`f` at row 1 SELECT * FROM t1 ORDER BY f; f 0 diff --git a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result index ec8a947a78c..ad920deeda4 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result @@ -826,7 +826,7 @@ Warning 1365 Division by 0 Warning 1365 Division by 0 Warning 1365 Division by 0 INSERT INTO Sow6_2f VALUES ('a59b'); -ERROR 22007: Incorrect decimal value: 'a59b' for column 'col1' at row 1 +ERROR 22007: Incorrect decimal value: 'a59b' for column `test`.`Sow6_2f`.`col1` at row 1 drop table Sow6_2f; select 10.3330000000000/12.34500000; 10.3330000000000/12.34500000 |