From 81f6a3b0e53baa8a901da0585f0c8ecffc8449fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Sat, 27 Apr 2019 20:01:59 +0300 Subject: [PATCH] Adjust perfschema.privilege_table_io result This is fixup for the merge commit e6bdf77e4be48750c4808a09af197ed91fd69a61 FIXME: Find out why the results differ between release and debug builds. --- .../r/privilege_table_io,release.rdiff | 20 +++++++++++++++++++ .../perfschema/t/privilege_table_io.test | 1 + 2 files changed, 21 insertions(+) create mode 100644 mysql-test/suite/perfschema/r/privilege_table_io,release.rdiff diff --git a/mysql-test/suite/perfschema/r/privilege_table_io,release.rdiff b/mysql-test/suite/perfschema/r/privilege_table_io,release.rdiff new file mode 100644 index 00000000000..40eaa20d499 --- /dev/null +++ b/mysql-test/suite/perfschema/r/privilege_table_io,release.rdiff @@ -0,0 +1,20 @@ +--- privilege_table_io.result ++++ privilege_table_io.result +@@ -110,17 +110,6 @@ + wait/io/table/sql/handler handler.cc: TABLE mysql roles_mapping fetch NULL + wait/io/table/sql/handler handler.cc: TABLE mysql tables_priv fetch NULL + wait/io/table/sql/handler handler.cc: TABLE mysql procs_priv fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql table_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL +-wait/io/table/sql/handler handler.cc: TABLE mysql index_stats fetch NULL + wait/io/table/sql/handler handler.cc: TABLE mysql servers fetch NULL + wait/io/table/sql/handler handler.cc: TABLE mysql table_stats fetch NULL + wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL diff --git a/mysql-test/suite/perfschema/t/privilege_table_io.test b/mysql-test/suite/perfschema/t/privilege_table_io.test index a74805f5c7b..73e6b0e546e 100644 --- a/mysql-test/suite/perfschema/t/privilege_table_io.test +++ b/mysql-test/suite/perfschema/t/privilege_table_io.test @@ -5,6 +5,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc --source include/restart_mysqld.inc +--source include/maybe_debug.inc --source ../include/table_io_setup_helper.inc # Remove "deleted" records from mysql.db that may come from previous tests,