From e6b50eb51b62de11d00208548ed1d2c245040ed9 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Mon, 27 Aug 2007 11:27:03 +0200 Subject: [PATCH] Bug#30487 mysql_upgrade reports misleading errors - Update result file to include these "misleading errors", better to run mysql_upgrade with them than not at all. --- mysql-test/r/mysql_upgrade.result | 32 +++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 30ece1b121a..31846f68b7b 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -3,7 +3,9 @@ mysql.columns_priv OK mysql.db OK mysql.event OK mysql.func OK -mysql.general_log OK +mysql.general_log +Error : You can't use locks with log tables. +status : OK mysql.help_category OK mysql.help_keyword OK mysql.help_relation OK @@ -14,7 +16,9 @@ mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.servers OK -mysql.slow_log OK +mysql.slow_log +Error : You can't use locks with log tables. +status : OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -29,7 +33,9 @@ mysql.columns_priv OK mysql.db OK mysql.event OK mysql.func OK -mysql.general_log OK +mysql.general_log +Error : You can't use locks with log tables. +status : OK mysql.help_category OK mysql.help_keyword OK mysql.help_relation OK @@ -40,7 +46,9 @@ mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.servers OK -mysql.slow_log OK +mysql.slow_log +Error : You can't use locks with log tables. +status : OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -55,7 +63,9 @@ mysql.columns_priv OK mysql.db OK mysql.event OK mysql.func OK -mysql.general_log OK +mysql.general_log +Error : You can't use locks with log tables. +status : OK mysql.help_category OK mysql.help_keyword OK mysql.help_relation OK @@ -66,7 +76,9 @@ mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.servers OK -mysql.slow_log OK +mysql.slow_log +Error : You can't use locks with log tables. +status : OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -83,7 +95,9 @@ mysql.columns_priv OK mysql.db OK mysql.event OK mysql.func OK -mysql.general_log OK +mysql.general_log +Error : You can't use locks with log tables. +status : OK mysql.help_category OK mysql.help_keyword OK mysql.help_relation OK @@ -94,7 +108,9 @@ mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.servers OK -mysql.slow_log OK +mysql.slow_log +Error : You can't use locks with log tables. +status : OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK