Merge branch '10.0' into merge-wip

5 files changed, 93 insertions, 85 deletions

diff --git a/mysql-test/suite/engines/iuds/combinations b/mysql-test/suite/engines/iuds/combinations
new file mode 100644
index 00000000000..2077c41a7be
--- /dev/null
+++ b/mysql-test/suite/engines/iuds/combinations
@@ -0,0 +1,8 @@
+[innodb]
+innodb
+default-storage-engine=innodb
+
+[myisam]
+skip-innodb
+default-storage-engine=myisam
+
diff --git a/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result b/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
index 08eecb1c17d..fdd1a4be290 100644
--- a/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
+++ b/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
diff --git a/mysql-test/suite/engines/iuds/r/strings_update_delete.result b/mysql-test/suite/engines/iuds/r/strings_update_delete.result
index 283f39efe84..159d2608ea1 100644
--- a/mysql-test/suite/engines/iuds/r/strings_update_delete.result
+++ b/mysql-test/suite/engines/iuds/r/strings_update_delete.result
@@ -70471,17 +70471,17 @@ SIZE
 DROP TABLE t17,t18;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18;
 Warnings:
-Note	1051	Unknown table 't3'
-Note	1051	Unknown table 't4'
-Note	1051	Unknown table 't5'
-Note	1051	Unknown table 't6'
-Note	1051	Unknown table 't7'
-Note	1051	Unknown table 't8'
-Note	1051	Unknown table 't9'
-Note	1051	Unknown table 't10'
-Note	1051	Unknown table 't11'
-Note	1051	Unknown table 't13'
-Note	1051	Unknown table 't14'
-Note	1051	Unknown table 't15'
-Note	1051	Unknown table 't17'
-Note	1051	Unknown table 't18'
+Note	1051	Unknown table 'test.t3'
+Note	1051	Unknown table 'test.t4'
+Note	1051	Unknown table 'test.t5'
+Note	1051	Unknown table 'test.t6'
+Note	1051	Unknown table 'test.t7'
+Note	1051	Unknown table 'test.t8'
+Note	1051	Unknown table 'test.t9'
+Note	1051	Unknown table 'test.t10'
+Note	1051	Unknown table 'test.t11'
+Note	1051	Unknown table 'test.t13'
+Note	1051	Unknown table 'test.t14'
+Note	1051	Unknown table 'test.t15'
+Note	1051	Unknown table 'test.t17'
+Note	1051	Unknown table 'test.t18'
diff --git a/mysql-test/suite/engines/iuds/r/type_bit_iuds.result b/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
index 7cfeb1958cf..b7a910f36e6 100644
--- a/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
+++ b/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
@@ -780,7 +780,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'0';
 0 + b'0'
 0
@@ -1611,7 +1611,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'0';
 0 + b'0'
 0
@@ -2461,7 +2461,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'0';
 0 + b'0'
 0
@@ -3375,7 +3375,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'0';
 0 + b'0'
 0
@@ -4574,7 +4574,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'0';
 0 + b'0'
 0
@@ -5978,7 +5978,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'0';
 0 + b'0'
 0
@@ -8049,7 +8049,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'0';
 0 + b'0'
 0
@@ -11227,7 +11227,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1';
 0 + b'1'
 1
@@ -12009,7 +12009,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1';
 0 + b'1'
 1
@@ -12840,7 +12840,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1';
 0 + b'1'
 1
@@ -13690,7 +13690,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1';
 0 + b'1'
 1
@@ -14604,7 +14604,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1';
 0 + b'1'
 1
@@ -15803,7 +15803,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1';
 0 + b'1'
 1
@@ -17207,7 +17207,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1';
 0 + b'1'
 1
@@ -19278,7 +19278,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1';
 0 + b'1'
 1
@@ -22456,7 +22456,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'10';
 0 + b'10'
 2
@@ -23244,7 +23244,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'10';
 0 + b'10'
 2
@@ -24081,7 +24081,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'10';
 0 + b'10'
 2
@@ -24931,7 +24931,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'10';
 0 + b'10'
 2
@@ -25845,7 +25845,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'10';
 0 + b'10'
 2
@@ -27044,7 +27044,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'10';
 0 + b'10'
 2
@@ -28448,7 +28448,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'10';
 0 + b'10'
 2
@@ -30519,7 +30519,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'10';
 0 + b'10'
 2
@@ -33697,7 +33697,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010';
 0 + b'1010'
 10
@@ -34485,7 +34485,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010';
 0 + b'1010'
 10
@@ -35322,7 +35322,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010';
 0 + b'1010'
 10
@@ -36178,7 +36178,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010';
 0 + b'1010'
 10
@@ -37092,7 +37092,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010';
 0 + b'1010'
 10
@@ -38291,7 +38291,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010';
 0 + b'1010'
 10
@@ -39695,7 +39695,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010';
 0 + b'1010'
 10
@@ -41766,7 +41766,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010';
 0 + b'1010'
 10
@@ -44944,7 +44944,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010101010101010';
 0 + b'1010101010101010'
 43690
@@ -45732,7 +45732,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010101010101010';
 0 + b'1010101010101010'
 43690
@@ -46569,7 +46569,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010101010101010';
 0 + b'1010101010101010'
 43690
@@ -47425,7 +47425,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010101010101010';
 0 + b'1010101010101010'
 43690
@@ -48345,7 +48345,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010101010101010';
 0 + b'1010101010101010'
 43690
@@ -49550,7 +49550,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010101010101010';
 0 + b'1010101010101010'
 43690
@@ -50954,7 +50954,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010101010101010';
 0 + b'1010101010101010'
 43690
@@ -53025,7 +53025,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'1010101010101010';
 0 + b'1010101010101010'
 43690
@@ -56203,7 +56203,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'101010101010101010101010101010';
 0 + b'101010101010101010101010101010'
 715827882
@@ -56993,7 +56993,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'101010101010101010101010101010';
 0 + b'101010101010101010101010101010'
 715827882
@@ -57832,7 +57832,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'101010101010101010101010101010';
 0 + b'101010101010101010101010101010'
 715827882
@@ -58690,7 +58690,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'101010101010101010101010101010';
 0 + b'101010101010101010101010101010'
 715827882
@@ -59612,7 +59612,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'101010101010101010101010101010';
 0 + b'101010101010101010101010101010'
 715827882
@@ -60819,7 +60819,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'101010101010101010101010101010';
 0 + b'101010101010101010101010101010'
 715827882
@@ -62231,7 +62231,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'101010101010101010101010101010';
 0 + b'101010101010101010101010101010'
 715827882
@@ -64304,7 +64304,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + b'101010101010101010101010101010';
 0 + b'101010101010101010101010101010'
 715827882
@@ -67484,7 +67484,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<0);
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<0)
 9223372036854775807
@@ -68271,7 +68271,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<1);
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<1)
 18446744073709551614
@@ -69107,7 +69107,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<2);
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<2)
 18446744073709551612
@@ -69962,7 +69962,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<4);
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<4)
 18446744073709551600
@@ -70881,7 +70881,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<8);
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<8)
 18446744073709551360
@@ -72085,7 +72085,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<16);
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<16)
 18446744073709486080
@@ -73494,7 +73494,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<32);
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<32)
 18446744069414584320
@@ -75570,7 +75570,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<64);
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<64)
 0
@@ -78747,7 +78747,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<0);
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<0)
 9223372036854775807
@@ -79534,7 +79534,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<1);
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<1)
 18446744073709551614
@@ -80370,7 +80370,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<2);
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<2)
 18446744073709551612
@@ -81225,7 +81225,7 @@ hex(c1)	hex(c2)
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<4);
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<4)
 18446744073709551600
@@ -82144,7 +82144,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<8);
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<8)
 18446744073709551360
@@ -83348,7 +83348,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<16);
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<16)
 18446744073709486080
@@ -84757,7 +84757,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<32);
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<32)
 18446744069414584320
@@ -86833,7 +86833,7 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
 SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<64);
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<64)
 0
@@ -90016,4 +90016,4 @@ A	A
 DELETE t5,t6 FROM t5,t6 WHERE  t5.c1=t6.c1 AND t5.c2=t6.c2;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 Warnings:
-Note	1051	Unknown table 't3'
+Note	1051	Unknown table 'test.t3'
diff --git a/mysql-test/suite/engines/iuds/r/update_delete_number.result b/mysql-test/suite/engines/iuds/r/update_delete_number.result
index 8e190870092..15de16ed714 100644
--- a/mysql-test/suite/engines/iuds/r/update_delete_number.result
+++ b/mysql-test/suite/engines/iuds/r/update_delete_number.result
@@ -740,7 +740,7 @@ DELETE FROM a1, a2 USING t1 AS a1 INNER JOIN t2 AS a2 WHERE a2.c1=a1.c2;
 SELECT * FROM t1,t2 WHERE t2.c1=t1.c2;
 c1	c2	c3	c1	c2	c3
 DELETE FROM t1,t2 using t1,t2 where t1.c1=(select c1 from t1);
-ERROR HY000: You can't specify target table 't1' for update in FROM clause
+ERROR HY000: Table 't1' is specified twice, both as a target for 'DELETE' and as a separate source for data
 CREATE TABLE t3(c1 INT UNSIGNED NOT NULL PRIMARY KEY, c2 INT SIGNED NULL, c3 INT);
 CREATE TABLE t4(c1 INT UNSIGNED, c2 INT);
 INSERT INTO t3 VALUES(200,126,1),(250,-127,2);
@@ -980,9 +980,9 @@ drop table mt1, mt2, mt3;
 create table mt1 (col1 int);
 create table mt2 (col1 int);
 update mt1,mt2 set mt1.col1 = (select max(col1) from mt1) where mt1.col1 = mt2.col1;
-ERROR HY000: You can't specify target table 'mt1' for update in FROM clause
+ERROR HY000: Table 'mt1' is specified twice, both as a target for 'UPDATE' and as a separate source for data
 delete mt1 from mt1,mt2 where mt1.col1 < (select max(col1) from mt1) and mt1.col1 = mt2.col1;
-ERROR HY000: You can't specify target table 'mt1' for update in FROM clause
+ERROR HY000: Table 'mt1' is specified twice, both as a target for 'DELETE' and as a separate source for data
 drop table mt1,mt2;
 CREATE TABLE IF NOT EXISTS `mt1` (`id` int(11) NOT NULL auto_increment, `tst` text, `tsmt1` text, PRIMARY KEY  (`id`));
 CREATE TABLE IF NOT EXISTS `mt2` (`ID` int(11) NOT NULL auto_increment, `ParId` int(11) default NULL, `tst` text, `tsmt1` text, PRIMARY KEY  (`ID`), KEY `IX_ParId_mt2` (`ParId`),  FOREIGN KEY (`ParId`) REFERENCES `mt1` (`id`));
@@ -1853,7 +1853,7 @@ DELETE FROM a1, a2 USING t1 AS a1 INNER JOIN t2 AS a2 WHERE a2.c1=a1.c2;
 SELECT * FROM t1,t2 WHERE t2.c1=t1.c2;
 c1	c2	c3	c1	c2	c3
 DELETE FROM t1,t2 using t1,t2 where t1.c1=(select c1 from t1);
-ERROR HY000: You can't specify target table 't1' for update in FROM clause
+ERROR HY000: Table 't1' is specified twice, both as a target for 'DELETE' and as a separate source for data
 CREATE TABLE t3(c1 TINYINT UNSIGNED NOT NULL PRIMARY KEY, c2 TINYINT SIGNED NULL, c3 INT);
 CREATE TABLE t4(c1 TINYINT UNSIGNED, c2 INT);
 INSERT INTO t3 VALUES(200,126,1),(250,-127,2);
@@ -2600,7 +2600,7 @@ DELETE FROM a1, a2 USING t1 AS a1 INNER JOIN t2 AS a2 WHERE a2.c1=a1.c2;
 SELECT * FROM t1,t2 WHERE t2.c1=t1.c2;
 c1	c2	c3	c1	c2	c3
 DELETE FROM t1,t2 using t1,t2 where t1.c1=(select c1 from t1);
-ERROR HY000: You can't specify target table 't1' for update in FROM clause
+ERROR HY000: Table 't1' is specified twice, both as a target for 'DELETE' and as a separate source for data
 CREATE TABLE t3(c1 SMALLINT UNSIGNED NOT NULL PRIMARY KEY, c2 SMALLINT SIGNED NULL, c3 INT);
 CREATE TABLE t4(c1 SMALLINT UNSIGNED, c2 INT);
 INSERT INTO t3 VALUES(200,126,1),(250,-127,2);
@@ -3347,7 +3347,7 @@ DELETE FROM a1, a2 USING t1 AS a1 INNER JOIN t2 AS a2 WHERE a2.c1=a1.c2;
 SELECT * FROM t1,t2 WHERE t2.c1=t1.c2;
 c1	c2	c3	c1	c2	c3
 DELETE FROM t1,t2 using t1,t2 where t1.c1=(select c1 from t1);
-ERROR HY000: You can't specify target table 't1' for update in FROM clause
+ERROR HY000: Table 't1' is specified twice, both as a target for 'DELETE' and as a separate source for data
 CREATE TABLE t3(c1 MEDIUMINT UNSIGNED NOT NULL PRIMARY KEY, c2 MEDIUMINT SIGNED NULL, c3 INT);
 CREATE TABLE t4(c1 MEDIUMINT UNSIGNED, c2 INT);
 INSERT INTO t3 VALUES(200,126,1),(250,-127,2);
@@ -4077,7 +4077,7 @@ DELETE FROM a1, a2 USING t1 AS a1 INNER JOIN t2 AS a2 WHERE a2.c1=a1.c2;
 SELECT * FROM t1,t2 WHERE t2.c1=t1.c2;
 c1	c2	c3	c1	c2	c3
 DELETE FROM t1,t2 using t1,t2 where t1.c1=(select c1 from t1);
-ERROR HY000: You can't specify target table 't1' for update in FROM clause
+ERROR HY000: Table 't1' is specified twice, both as a target for 'DELETE' and as a separate source for data
 CREATE TABLE t3(c1 BIGINT UNSIGNED NOT NULL PRIMARY KEY, c2 BIGINT SIGNED NULL, c3 INT);
 CREATE TABLE t4(c1 BIGINT UNSIGNED, c2 INT);
 INSERT INTO t3 VALUES(200,126,1),(250,-127,2);