summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysql_upgrade.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/mysql_upgrade.test')
-rw-r--r--mysql-test/main/mysql_upgrade.test5
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
index cce50a32034..0751cee7429 100644
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@@ -496,7 +496,10 @@ rename table mysql.global_priv_bak to mysql.global_priv;
--echo #
# The warning appears during mysql_upgrade, before the schema becomes consistent
-call mtr.add_suppression("innodb_table_stats has length mismatch in the column name table_name");
+call mtr.add_suppression("innodb_(table|index)_stats has length mismatch in the column name table_name");
+# This comes from opening 10.6 sys.host_summary view that uses sys.format_time function,
+# on still inconsistent mysql.proc, in older versions
+call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 21, found 20.");
--let $old_version= 5.5
--source include/load_dump_and_upgrade.inc