From 3725080c2560be76674300296f3ed2b536d9067b Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 15 Jul 2010 19:18:44 -0600 Subject: Bug#53617 Missing performance schema tables not reported in the server log at startup Backport from mysql-next-mr (5.6) to mysql-trunk (5.5) --- storage/perfschema/pfs_engine_table.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'storage/perfschema') diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc index 30c9ac966c4..7b6fd055729 100644 --- a/storage/perfschema/pfs_engine_table.cc +++ b/storage/perfschema/pfs_engine_table.cc @@ -108,7 +108,12 @@ void PFS_check_intact::report_error(uint code, const char *fmt, ...) my_vsnprintf(buff, sizeof(buff), fmt, args); va_end(args); - my_message(code, buff, MYF(0)); + /* + This is an install/upgrade issue: + - do not report it in the user connection, there is none in main(), + - report it in the server error log. + */ + sql_print_error("%s", buff); } /** @@ -139,6 +144,9 @@ void PFS_engine_table_share::check_one_table(THD *thd) m_checked= true; close_thread_tables(thd); } + else + sql_print_error(ER(ER_WRONG_NATIVE_TABLE_STRUCTURE), + PERFORMANCE_SCHEMA_str.str, m_name.str); lex_end(&dummy_lex); thd->lex= old_lex; -- cgit v1.2.1