revision-id: a24dda9abbffa6dfd28f28dd1e917c570a5ef0cf (mariadb-10.2.18-81-ga24dda9) parent(s): 667d1786a96a40ee5074c9f1b493c7cf05a85cca committer: Alexey Botchkov timestamp: 2018-11-13 00:27:31 +0400 message: MDEV-14576 Include full name of object in message about incorrect value for column. Two test result changes. --- mysql-test/r/create.result | 6 +++--- mysql-test/r/myisam_icp.result | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 2159127..2ff4bac 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1225,7 +1225,7 @@ INSERT INTO t3 VALUES (0); SET sql_mode = TRADITIONAL; ALTER TABLE t3 ADD INDEX(c1); -ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'c1' at row 1 +ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t3`.`c1` at row 1 # -- Cleanup. SET sql_mode = ''; @@ -1783,12 +1783,12 @@ NULL 0000-00-00 0000-00-00 drop table t1; set @@session.sql_mode='STRICT_ALL_TABLES'; create table if not exists t1 (a int, b date, c date) select 1 as b, 2 as c; -ERROR 22007: Incorrect date value: '1' for column 'b' at row 1 +ERROR 22007: Incorrect date value: '1' for column `test`.`t1`.`b` at row 1 select * from t1; ERROR 42S02: Table 'test.t1' doesn't exist create table if not exists t1 (a int, b date, c date) replace select 1 as b, 2 as c; -ERROR 22007: Incorrect date value: '1' for column 'b' at row 1 +ERROR 22007: Incorrect date value: '1' for column `test`.`t1`.`b` at row 1 select * from t1; ERROR 42S02: Table 'test.t1' doesn't exist create table if not exists t1 (a int, b date, c date) diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/r/myisam_icp.result index 6a70521..2048205 100644 --- a/mysql-test/r/myisam_icp.result +++ b/mysql-test/r/myisam_icp.result @@ -849,7 +849,7 @@ DROP TABLE t1; create table t1 (a int,b char(5),primary key (a), key (b(1))); insert ignore into t1 values ('a','b'); Warnings: -Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1 +Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`a` at row 1 select 1 from t1 where a and b >= 'aa'; 1 drop table t1;