MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Marc Alff Date:August 7 2008 2:19am
Subject:bzr commit into mysql-6.0-wl2110-review branch (marc.alff:2677) WL#2110
View as plain text  
#At file:///home/malff/BZR-TREE/mysql-6.0-wl2110-review-part1/

 2677 Marc Alff	2008-08-06
      WL#2110 (SIGNAL)
      
      Implemented code review comments from the review of patch 2/10
      
      Implemented changes to comply with the decisions documented on 2008-08-06 in the RESIGNAL work log (2265).
      (initialisation of condition items in RESIGNAL)
modified:
  sql/sql_parse.cc
  sql/sql_signal.h

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2008-08-05 18:23:37 +0000
+++ b/sql/sql_parse.cc	2008-08-07 02:18:58 +0000
@@ -1868,7 +1868,6 @@ mysql_execute_command(THD *thd)
     thd->main_da.m_stmt_area.set_read_only(FALSE);
     if ((all_tables || !lex->is_single_level_stmt()) && !thd->spcont)
       mysql_reset_errors(thd, 0);
-    thd->main_da.m_stmt_area.m_command_function_cmd= lex->sql_command;
   }
 
 #ifdef HAVE_REPLICATION

=== modified file 'sql/sql_signal.h'
--- a/sql/sql_signal.h	2008-07-23 00:22:36 +0000
+++ b/sql/sql_signal.h	2008-08-07 02:18:58 +0000
@@ -41,7 +41,8 @@ protected:
   {}
 
   /**
-    Evaluate the condition sqlcode and sqlstate for this statement.
+    Evaluate the condition items 'MYSQL_ERRNO', 'RETURNED_SQLSTATE' and 'level'
+    default values for this statement.
     @param thd the current thread.
     @param cond the condition to update.
     @return 0 on success.
@@ -49,12 +50,12 @@ protected:
   int eval_sqlcode_sqlstate(THD *thd, SQL_condition *cond);
 
   /**
-    Evaluate default values for signal condition items for this statement.
+    Evaluate condition item 'MESSAGE_TEXT' default value.
     @param thd the current thread.
     @param cond the condition to update.
     @return 0 on success.
   */
-  int eval_defaults(THD *thd, SQL_condition *cond);
+  int eval_default_message_text(THD *thd, SQL_condition *cond);
 
   /**
     Evaluate each signal condition items for this statement.

Thread
bzr commit into mysql-6.0-wl2110-review branch (marc.alff:2677) WL#2110Marc Alff7 Aug