From bb7ae40a7a820abcffd7e36229f05322e7c9b92f Mon Sep 17 00:00:00 2001 From: unknown <sanja@sun.com> Date: Tue, 25 Nov 2008 17:34:05 +0200 Subject: [PATCH] Fix of the small merge bug. --- sql/mysqld.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index acfa6095a3..74b4ebbe55 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2823,7 +2823,8 @@ int my_message_sql(uint error, const char *str, myf MyFlags) if (error == 0) { /* At least, prevent new abuse ... */ - DBUG_ASSERT(strncmp(str, "MyISAM table", 12) == 0); + DBUG_ASSERT(strncmp(str, "MyISAM table", 12) == 0 || + strncmp(str, "MARIA table", 11) == 0); error= ER_UNKNOWN_ERROR; } -- 2.30.9