Fix of the small merge bug.

bb7ae40a · unknown · 3c1e153a · bb7ae40a
Commit bb7ae40a authored Nov 25, 2008 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/mysqld.cc sql/mysqld.cc +2 -1

No files found.
--- 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;
  }