bk commit into 5.0 tree (anozdrin:1.2523) BUG#25411

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.0 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-19 01:54:35+04:00, anozdrin@ibm. +5 -0
  Fix typo in the patch for BUG#25411 on 24-Apr-2007.

  sql/handler.cc@stripped, 2007-06-19 01:54:32+04:00, anozdrin@ibm. +1 -1
    Polishing to have the consistent code.

  sql/sp.cc@stripped, 2007-06-19 01:54:33+04:00, anozdrin@ibm. +1 -1
    Fix typo in the patch for BUG#25411 on 24-Apr-2007.

  sql/sp_head.cc@stripped, 2007-06-19 01:54:33+04:00, anozdrin@ibm. +2 -2
    Polishing to have the consistent code.

  sql/sql_error.cc@stripped, 2007-06-19 01:54:33+04:00, anozdrin@ibm. +1 -1
    Polishing to have the consistent code.

  sql/sql_trigger.cc@stripped, 2007-06-19 01:54:33+04:00, anozdrin@ibm. +1 -1
    Polishing to have the consistent code.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	ibm.
# Root:	/home/alik/Documents/MySQL/devel/5.0-rt-build

--- 1.233/sql/handler.cc	2007-05-07 23:12:13 +04:00
+++ 1.234/sql/handler.cc	2007-06-19 01:54:32 +04:00
@@ -1343,7 +1343,7 @@
 
     strmake(buff, thd->net.last_error, sizeof(buff)-1);
     thd->query_error= 0;
-    thd->spcont= 0;
+    thd->spcont= NULL;
     thd->lex->current_select= 0;
     thd->net.last_error[0]= 0;
 

--- 1.67/sql/sql_trigger.cc	2007-05-11 20:33:11 +04:00
+++ 1.68/sql/sql_trigger.cc	2007-06-19 01:54:33 +04:00
@@ -982,7 +982,7 @@
         Lex_input_stream lip(thd, trg_create_str->str, trg_create_str->length);
         thd->m_lip= &lip;
         lex_start(thd);
-	thd->spcont= 0;
+	thd->spcont= NULL;
         int err= MYSQLparse((void *)thd);
 
         if (err || thd->is_fatal_error)

--- 1.131/sql/sp.cc	2007-05-18 00:17:45 +04:00
+++ 1.132/sql/sp.cc	2007-06-19 01:54:33 +04:00
@@ -438,10 +438,10 @@
     Lex_input_stream lip(thd, defstr.c_ptr(), defstr.length());
     thd->m_lip= &lip;
     lex_start(thd);
+    thd->spcont= NULL;
     ret= MYSQLparse(thd);
   }
 
-  thd->spcont= 0;
   if (ret || thd->is_fatal_error || newlex.sphead == NULL)
   {
     sp_head *sp= newlex.sphead;

--- 1.248/sql/sp_head.cc	2007-06-02 02:42:03 +04:00
+++ 1.249/sql/sp_head.cc	2007-06-19 01:54:33 +04:00
@@ -2581,7 +2581,7 @@
 
       sp_rcontext *spcont= thd->spcont;
     
-      thd->spcont= 0;           /* Avoid handlers */
+      thd->spcont= NULL;           /* Avoid handlers */
       my_error(ER_OUT_OF_RESOURCES, MYF(0));
       spcont->clear_handler();
       thd->spcont= spcont;
@@ -3316,7 +3316,7 @@
 
       sp_rcontext *spcont= thd->spcont;
     
-      thd->spcont= 0;           /* Avoid handlers */
+      thd->spcont= NULL;           /* Avoid handlers */
       my_error(ER_OUT_OF_RESOURCES, MYF(0));
       spcont->clear_handler();
       thd->spcont= spcont;

--- 1.39/sql/sql_error.cc	2006-12-23 22:04:27 +03:00
+++ 1.40/sql/sql_error.cc	2007-06-19 01:54:33 +04:00
@@ -126,7 +126,7 @@
     sp_rcontext *spcont= thd->spcont;
 
     thd->no_warnings_for_error= 1;
-    thd->spcont= 0;
+    thd->spcont= NULL;
 
     thd->killed= THD::KILL_BAD_DATA;
     my_message(code, msg, MYF(0));