summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql_upgrade_ssl.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-08-16 10:25:56 +0400
committerAlexander Nozdrin <alik@sun.com>2010-08-16 10:25:56 +0400
commit32edab6bfe4fada3adbf8688375600c8f911c82c (patch)
tree10c9d949babf016e620d07d0897e2a25619d32fb /mysql-test/r/mysql_upgrade_ssl.result
parent81906cdf3805fe5fcea47fef11945f9adbcef4d8 (diff)
parent8b645bed977cbdbec7ab6ece552a6adfaeacf030 (diff)
downloadmariadb-git-32edab6bfe4fada3adbf8688375600c8f911c82c.tar.gz
Auto-merge from mysql-5.5-stage.
Diffstat (limited to 'mysql-test/r/mysql_upgrade_ssl.result')
-rw-r--r--mysql-test/r/mysql_upgrade_ssl.result32
1 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/r/mysql_upgrade_ssl.result
new file mode 100644
index 00000000000..f1229c4a405
--- /dev/null
+++ b/mysql-test/r/mysql_upgrade_ssl.result
@@ -0,0 +1,32 @@
+#
+# Bug#55672 mysql_upgrade dies with internal error
+#
+mtr.global_suppressions OK
+mtr.test_suppressions OK
+mysql.columns_priv OK
+mysql.db OK
+mysql.event OK
+mysql.func 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
+mysql.help_topic OK
+mysql.host OK
+mysql.ndb_binlog_index OK
+mysql.plugin OK
+mysql.proc OK
+mysql.procs_priv OK
+mysql.servers 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
+mysql.time_zone_name OK
+mysql.time_zone_transition OK
+mysql.time_zone_transition_type OK
+mysql.user OK