From 20011c8b14ad298fa028e0158b3fdbf1268b9c9c Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Sun, 16 Dec 2018 18:43:51 +0400 Subject: [PATCH] MDEV-14576 Include full name of object in message about incorrect value for column. galera_prepared_statement test fixed. --- mysql-test/suite/galera/r/galera_prepared_statement.result | 2 +- mysql-test/t/type_newdecimal.test | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/r/galera_prepared_statement.result b/mysql-test/suite/galera/r/galera_prepared_statement.result index d32d412ff46..6f546b32819 100644 --- a/mysql-test/suite/galera/r/galera_prepared_statement.result +++ b/mysql-test/suite/galera/r/galera_prepared_statement.result @@ -28,7 +28,7 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER; ALTER TABLE t1 DROP COLUMN f1; connection node_1; EXECUTE st1; -ERROR 22007: Incorrect integer value: 'abc' for column 'f2' at row 1 +ERROR 22007: Incorrect integer value: 'abc' for column `test`.`t1`.`f2` at row 1 connection node_1; DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/t/type_newdecimal.test index d2d64b0baee..56273a47b44 100644 --- a/mysql-test/t/type_newdecimal.test +++ b/mysql-test/t/type_newdecimal.test @@ -837,6 +837,7 @@ UPDATE Sow6_2f SET col1 = col1 / 0 WHERE col1 > 0; #-- should return SQLSTATE 22012 division by zero SELECT MOD(col1,0) FROM Sow6_2f; #-- should return SQLSTATE 22012 division by zero +--replace_result sow Sow -- error 1366 INSERT INTO Sow6_2f VALUES ('a59b'); #-- should return SQLSTATE 22018 invalid character value for cast