bzr commit into mysql-trunk-bugfixing branch (davi:3132)

[Davi Arnaut]

# At a local mysql-trunk-bugfixing repository of davi

 3132 Davi Arnaut	2010-07-20
      Remove exceptions to the assert, bug has been fixed.

    modified:
      sql/sql_error.cc
=== modified file 'sql/sql_error.cc'
--- a/sql/sql_error.cc	2010-03-31 14:05:33 +0000
+++ b/sql/sql_error.cc	2010-07-20 11:57:02 +0000
@@ -588,16 +588,11 @@ void push_warning(THD *thd, MYSQL_ERROR:
   DBUG_PRINT("enter", ("code: %d, msg: %s", code, msg));
 
   /*
-    Calling push_warning/push_warning_printf with a
-    level of WARN_LEVEL_ERROR *is* a bug.
-    Either use my_error(), or WARN_LEVEL_WARN.
-    Please fix the calling code, and do *NOT*
-    add more work around code in the assert below.
+    Calling push_warning/push_warning_printf with a level of
+    WARN_LEVEL_ERROR *is* a bug.  Either use my_printf_error(),
+    my_error(), or WARN_LEVEL_WARN.
   */
-  DBUG_ASSERT(   (level != MYSQL_ERROR::WARN_LEVEL_ERROR)
-              || (code == ER_CANT_CREATE_TABLE) /* See Bug#47233 */
-              || (code == ER_ILLEGAL_HA_CREATE_OPTION) /* See Bug#47233 */
-             );
+  DBUG_ASSERT(level != MYSQL_ERROR::WARN_LEVEL_ERROR);
 
   if (level == MYSQL_ERROR::WARN_LEVEL_ERROR)
     level= MYSQL_ERROR::WARN_LEVEL_WARN;


Attachment: [text/bzr-bundle] bzr/[e-mail]