Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime

into  ibm.opbmk:/home/alik/Documents/MySQL/devel/5.0-rt-build

sql/handler.cc

@@ -1343,7 +1343,7 @@ int ha_delete_table(THD *thd, enum db_type table_type, const char *path,
 
     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;
 

sql/sp.cc

@@ -438,10 +438,10 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
     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;

sql/sp_head.cc

@@ -2581,7 +2581,7 @@ sp_instr_set::exec_core(THD *thd, uint *nextp)
 
       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_instr_set_case_expr::exec_core(THD *thd, uint *nextp)
 
       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;

sql/sql_error.cc

@@ -126,7 +126,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
     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));

sql/sql_trigger.cc

@@ -982,7 +982,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
         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)