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.

13 files changed, 26 insertions, 26 deletions

diff --git a/storage/connect/mysql-test/connect/r/dir.result b/storage/connect/mysql-test/connect/r/dir.result
index e10bb458d62..139544b99e9 100644
--- a/storage/connect/mysql-test/connect/r/dir.result
+++ b/storage/connect/mysql-test/connect/r/dir.result
@@ -26,7 +26,7 @@ fname	ftype	size
 boys	.txt	282
 boyswin	.txt	288
 INSERT INTO t1 VALUES ('','','','');
-ERROR 22007: Incorrect double value: '' for column 'size' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`size` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=DIR FILE_NAME='*.txt';
 ERROR HY000: Cannot get column info for table type DIR
diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result
index 2d5e5e64147..6617b49d682 100644
--- a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result
+++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result
@@ -6,7 +6,7 @@ created_at DATETIME
 ) DEFAULT CHARSET UTF8;
 INSERT INTO diaries (title, created_at)
 VALUES ('2012', '2012');
-ERROR 22007: Incorrect datetime value: '2012' for column 'created_at' at row 1
+ERROR 22007: Incorrect datetime value: '2012' for column `test`.`diaries`.`created_at` at row 1
 SELECT * FROM diaries;
 id	title	created_at
 DROP TABLE diaries;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
index 3703c208d0b..4ea8cbccc1e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
@@ -77,7 +77,7 @@ SET rocksdb_bulk_load=1;
 INSERT INTO t1 VALUES(13, 0);
 INSERT INTO t1 VALUES(2, 'test 2');
 Warnings:
-Warning	1366	Incorrect integer value: 'test 2' for column 'b' at row 1
+Warning	1366	Incorrect integer value: 'test 2' for column `test`.`t1`.`b` at row 1
 INSERT INTO t1 VALUES(@id, @arg04);
 SET @@global.table_open_cache=FALSE;
 Warnings:
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
index 2ae965b6cfc..64d87b7116d 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
@@ -577,8 +577,8 @@ b1	b2
 0	0
 INSERT INTO t1 (b1,b2) VALUES ('a','b');
 Warnings:
-Warning	1366	Incorrect integer value: 'a' for column 'b1' at row 1
-Warning	1366	Incorrect integer value: 'b' for column 'b2' at row 1
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning	1366	Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
 SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
index a834310417e..ba651fcbb14 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
@@ -500,8 +500,8 @@ b1	b2
 0	0
 INSERT INTO t1 (b1,b2) VALUES ('a','b');
 Warnings:
-Warning	1366	Incorrect integer value: 'a' for column 'b1' at row 1
-Warning	1366	Incorrect integer value: 'b' for column 'b2' at row 1
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning	1366	Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
 SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
index 2044310782d..de4ed87865e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
@@ -2451,9 +2451,9 @@ DROP TABLE t1;
 CREATE TABLE t2(id INT NOT NULL PRIMARY KEY, data INT) Engine=MEMORY;
 INSERT INTO t2 VALUES (100,NULL),(150,"long varchar"),(200,"varchar"),(250,"long long long varchar");
 Warnings:
-Warning	1366	Incorrect integer value: 'long varchar' for column 'data' at row 2
-Warning	1366	Incorrect integer value: 'varchar' for column 'data' at row 3
-Warning	1366	Incorrect integer value: 'long long long varchar' for column 'data' at row 4
+Warning	1366	Incorrect integer value: 'long varchar' for column `test`.`t2`.`data` at row 2
+Warning	1366	Incorrect integer value: 'varchar' for column `test`.`t2`.`data` at row 3
+Warning	1366	Incorrect integer value: 'long long long varchar' for column `test`.`t2`.`data` at row 4
 create TABLE t1 (a int not null, b int not null, primary key(a,b));
 INSERT INTO t1  VALUES (1,1);
 SELECT a FROM t1, t2 WHERE a=b AND (b NOT IN (SELECT a FROM t1 WHERE a > 4));
@@ -2542,10 +2542,10 @@ a
 truncate t1;
 INSERT INTO t1 VALUES(X'042000200020',X'042000200020'),(X'200400200020',X'200400200020');
 Warnings:
-Warning	1366	Incorrect integer value: '\x04 \x00 \x00 ' for column 'a' at row 1
-Warning	1366	Incorrect integer value: '\x04 \x00 \x00 ' for column 'b' at row 1
-Warning	1366	Incorrect integer value: ' \x04\x00 \x00 ' for column 'a' at row 2
-Warning	1366	Incorrect integer value: ' \x04\x00 \x00 ' for column 'b' at row 2
+Warning	1366	Incorrect integer value: '\x04 \x00 \x00 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect integer value: '\x04 \x00 \x00 ' for column `test`.`t1`.`b` at row 1
+Warning	1366	Incorrect integer value: ' \x04\x00 \x00 ' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect integer value: ' \x04\x00 \x00 ' for column `test`.`t1`.`b` at row 2
 UNLOCK TABLES;
 DROP TABLE t1;
 #
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result b/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
index 4abfdb49f37..bfe2c18acb4 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
@@ -45,8 +45,8 @@ b1	b2
 0	0
 INSERT INTO t1 (b1,b2) VALUES ('a','b');
 Warnings:
-Warning	1366	Incorrect integer value: 'a' for column 'b1' at row 1
-Warning	1366	Incorrect integer value: 'b' for column 'b2' at row 1
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning	1366	Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
 SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result
index 6ee39039985..cca18c7c1ab 100644
--- a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result
+++ b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result
@@ -194,7 +194,7 @@ INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
 insert ignore into t31 set f1=1, f2=1, f3=2, f4='second',
 f9=2.2,  f10='seven samurai', f28=222.222, f35='222';
 Warnings:
-Warning	1366	Incorrect integer value: 'seven samurai' for column 'f10' at row 1
+Warning	1366	Incorrect integer value: 'seven samurai' for column `test`.`t31`.`f10` at row 1
 insert ignore into t31 values (1, 1, 3, 'third',
 /* f5  BIGINT,  */            333333333333333333333333,
 /* f6  BLOB,  */              '3333333333333333333333',
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