Merge branch '10.4' into bb-10.4-mdev16188

9 files changed, 18 insertions, 4 deletions

diff --git a/mysql-test/suite/maria/icp.result b/mysql-test/suite/maria/icp.result
index d22e705e6de..8fc93e861a7 100644
--- a/mysql-test/suite/maria/icp.result
+++ b/mysql-test/suite/maria/icp.result
@@ -851,7 +851,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;
diff --git a/mysql-test/suite/maria/maria-autozerofill.result b/mysql-test/suite/maria/maria-autozerofill.result
index 76ccc67ebb5..064ac9e6496 100644
--- a/mysql-test/suite/maria/maria-autozerofill.result
+++ b/mysql-test/suite/maria/maria-autozerofill.result
@@ -56,6 +56,7 @@ mysqltest.t3	optimize	Note	Zerofilling moved table ./mysqltest/t3
 mysqltest.t3	optimize	status	OK
 analyze table t4;
 Table	Op	Msg_type	Msg_text
+mysqltest.t4	analyze	status	Engine-independent statistics collected
 mysqltest.t4	analyze	Note	Zerofilling moved table ./mysqltest/t4
 mysqltest.t4	analyze	status	OK
 repair table t5;
diff --git a/mysql-test/suite/maria/maria-gis-rtree-dynamic.result b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result
index 8bea5edb6fb..2f8c1b9408c 100644
--- a/mysql-test/suite/maria/maria-gis-rtree-dynamic.result
+++ b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result
@@ -749,6 +749,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 drop table t1;
 CREATE TABLE t1 (
diff --git a/mysql-test/suite/maria/maria-gis-rtree-trans.result b/mysql-test/suite/maria/maria-gis-rtree-trans.result
index 4a2f97fbd41..1c0d9e756a4 100644
--- a/mysql-test/suite/maria/maria-gis-rtree-trans.result
+++ b/mysql-test/suite/maria/maria-gis-rtree-trans.result
@@ -749,6 +749,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 drop table t1;
 CREATE TABLE t1 (
diff --git a/mysql-test/suite/maria/maria-gis-rtree.result b/mysql-test/suite/maria/maria-gis-rtree.result
index 901a7bee397..e39430a2efb 100644
--- a/mysql-test/suite/maria/maria-gis-rtree.result
+++ b/mysql-test/suite/maria/maria-gis-rtree.result
@@ -749,6 +749,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 drop table t1;
 CREATE TABLE t1 (
diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
index 83210676ed8..76b14024bf4 100644
--- a/mysql-test/suite/maria/maria.result
+++ b/mysql-test/suite/maria/maria.result
@@ -739,6 +739,7 @@ insert into t1 values (0),(1),(2),(3),(4);
 insert into t1 select NULL from t1;
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -759,6 +760,7 @@ insert into t1 values (11);
 delete from t1 where a=11;
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -770,7 +772,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE		
+t1	1	a	1	a	A	10	NULL	NULL	YES	BTREE		
 set aria_stats_method=DEFAULT;
 show variables like 'aria_stats_method';
 Variable_name	Value
@@ -779,6 +781,7 @@ insert into t1 values (11);
 delete from t1 where a=11;
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -806,6 +809,7 @@ insert into t1 values ('bce','def1', 'yuu', NULL);
 insert into t1 values ('bce','def2', NULL, 'quux');
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -816,6 +820,7 @@ t1	1	a	4	d	A	4	NULL	NULL	YES	BTREE
 delete from t1;
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -1690,9 +1695,11 @@ create table t1 (a int, key(a));
 insert into t1 values (1),(2),(3),(4),(NULL),(NULL),(NULL),(NULL);
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	Table is already up to date
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
diff --git a/mysql-test/suite/maria/maria3.result b/mysql-test/suite/maria/maria3.result
index 1fd49df00e1..ba8b64f9514 100644
--- a/mysql-test/suite/maria/maria3.result
+++ b/mysql-test/suite/maria/maria3.result
@@ -209,11 +209,13 @@ create table t2 like t1;
 insert into t2 select * from t1;
 analyze table t2;
 Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	Engine-independent statistics collected
 test.t2	analyze	status	Table is already up to date
 delete from t2;
 insert into t2 select * from t1;
 analyze table t2;
 Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	Engine-independent statistics collected
 test.t2	analyze	status	Table is already up to date
 drop table t1,t2;
 create table t1 (a bigint auto_increment, primary key(a), b char(255), c varchar(20000));
diff --git a/mysql-test/suite/maria/system_tables.result b/mysql-test/suite/maria/system_tables.result
index 32fddf6127e..c9944482638 100644
--- a/mysql-test/suite/maria/system_tables.result
+++ b/mysql-test/suite/maria/system_tables.result
@@ -3,6 +3,7 @@ LOCK TABLE t1 WRITE;
 connect  con1,localhost,root,,test;
 SET lock_wait_timeout= 2;
 FLUSH TABLES;
+FLUSH TABLES t1;
 connection default;
 CALL non_existing_sp;
 ERROR 42000: PROCEDURE test.non_existing_sp does not exist
diff --git a/mysql-test/suite/maria/system_tables.test b/mysql-test/suite/maria/system_tables.test
index 7b5c20ded85..950989fa5ca 100644
--- a/mysql-test/suite/maria/system_tables.test
+++ b/mysql-test/suite/maria/system_tables.test
@@ -12,8 +12,8 @@ LOCK TABLE t1 WRITE;
 
 --connect (con1,localhost,root,,test)
 SET lock_wait_timeout= 2;
---send
-  FLUSH TABLES;
+FLUSH TABLES;
+--send FLUSH TABLES t1
 --connection default
 --error ER_SP_DOES_NOT_EXIST
 CALL non_existing_sp;