bzr commit into mysql-6.0-wl2110-review branch (marc.alff:2705)

[Marc Alff]

#At file:///home/malff/BZR-TREE/mysql-6.0-wl2110-review/

 2705 Marc Alff	2008-10-03
      Fixed for symlink
modified:
  sql/sql_class.cc
  sql/sql_signal.cc

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-10-03 21:35:16 +0000
+++ b/sql/sql_class.cc	2008-10-03 23:24:46 +0000
@@ -831,6 +831,16 @@ SQL_condition* THD::raise_condition(uint
   if (query_id != warn_id && !spcont)
     mysql_reset_errors(this, 0);
 
+  /*
+    TODO: replace by DBUG_ASSERT(sql_errno != 0) once all bugs similar to
+    Bug#36760 are fixed: a SQL condition must have a real (!=0) error number
+    so that it can be caught by handlers.
+  */
+  if (sql_errno == 0)
+    sql_errno= ER_UNKNOWN_ERROR;
+  if (msg == NULL)
+    msg= ER(sql_errno);
+
   if ((level == MYSQL_ERROR::WARN_LEVEL_WARN) &&
       really_abort_on_warning())
   {

=== modified file 'sql/sql_signal.cc'
--- a/sql/sql_signal.cc	2008-10-03 21:35:16 +0000
+++ b/sql/sql_signal.cc	2008-10-03 23:24:46 +0000
@@ -308,17 +308,11 @@ void
 SQL_condition::set(uint sql_errno, const char* sqlstate,
                    MYSQL_ERROR::enum_warning_level level, const char* msg)
 {
-  /*
-    TODO: replace by DBUG_ASSERT(code != 0) once all bugs similar to
-    Bug#36760 are fixed: a SQL condition must have a real (!=0) error number
-    so that it can be caught by handlers.
-  */
-  if (sql_errno == 0)
-    sql_errno= ER_UNKNOWN_ERROR;
-  if (msg == NULL)
-    msg= ER(sql_errno);
-  m_sql_errno= sql_errno;
+  DBUG_ASSERT(sql_errno != 0);
+  DBUG_ASSERT(sqlstate != NULL);
+  DBUG_ASSERT(msg != NULL);
 
+  m_sql_errno= sql_errno;
   memcpy(m_returned_sqlstate, sqlstate, SQLSTATE_LENGTH);
   m_returned_sqlstate[SQLSTATE_LENGTH]= '\0';