List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:January 19 2011 3:09pm
Subject:bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3140)
View as plain text  
#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@strippedzxqdj

 3140 Magnus Blåudd	2011-01-19
      ndb
       - ha_ndbcluster uses push_warning_printf with WARN_LEVEL_ERROR a _lot_ 
         to make it possible for the user to see the real error which was reported
         from ndb.
       -It's unfortunately no longer allowed to use WARN_LEVEL_ERROR
        with push_warning to push a warning that says ERROR on the warning stack.
      - Since there is code in puch_warning that automatically downgrades all
         WARN_LEVEL_ERROR to WARN_LEVEL_WARN, just remove the
         DBUG_ASSERT for now.
       - This causes different outpu, but may be a good change. Let's see.

    modified:
      sql/sql_error.cc
=== modified file 'sql/sql_error.cc'
--- a/sql/sql_error.cc	2010-10-27 11:32:32 +0000
+++ b/sql/sql_error.cc	2011-01-19 15:09:32 +0000
@@ -579,12 +579,14 @@ void push_warning(THD *thd, MYSQL_ERROR:
   DBUG_ENTER("push_warning");
   DBUG_PRINT("enter", ("code: %d, msg: %s", code, msg));
 
+#ifdef MCP_BUGXXX
   /*
     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);
+#endif
 
   if (level == MYSQL_ERROR::WARN_LEVEL_ERROR)
     level= MYSQL_ERROR::WARN_LEVEL_WARN;

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110119150932-hs9ukl78r05awu1q.bundle
Thread
bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3140) Magnus Blåudd19 Jan