Commit c6d220e9 authored by unknown's avatar unknown

Fix typo in the patch for BUG#25411 on 24-Apr-2007.


sql/handler.cc:
  Polishing to have the consistent code.
sql/sp_head.cc:
  Polishing to have the consistent code.
sql/sql_error.cc:
  Polishing to have the consistent code.
sql/sql_trigger.cc:
  Polishing to have the consistent code.
parent 5b013eb6
...@@ -1343,7 +1343,7 @@ int ha_delete_table(THD *thd, enum db_type table_type, const char *path, ...@@ -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); strmake(buff, thd->net.last_error, sizeof(buff)-1);
thd->query_error= 0; thd->query_error= 0;
thd->spcont= 0; thd->spcont= NULL;
thd->lex->current_select= 0; thd->lex->current_select= 0;
thd->net.last_error[0]= 0; thd->net.last_error[0]= 0;
......
...@@ -438,10 +438,10 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, ...@@ -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()); Lex_input_stream lip(thd, defstr.c_ptr(), defstr.length());
thd->m_lip= &lip; thd->m_lip= &lip;
lex_start(thd); lex_start(thd);
thd->spcont= NULL;
ret= MYSQLparse(thd); ret= MYSQLparse(thd);
} }
thd->spcont= 0;
if (ret || thd->is_fatal_error || newlex.sphead == NULL) if (ret || thd->is_fatal_error || newlex.sphead == NULL)
{ {
sp_head *sp= newlex.sphead; sp_head *sp= newlex.sphead;
......
...@@ -2581,7 +2581,7 @@ sp_instr_set::exec_core(THD *thd, uint *nextp) ...@@ -2581,7 +2581,7 @@ sp_instr_set::exec_core(THD *thd, uint *nextp)
sp_rcontext *spcont= thd->spcont; sp_rcontext *spcont= thd->spcont;
thd->spcont= 0; /* Avoid handlers */ thd->spcont= NULL; /* Avoid handlers */
my_error(ER_OUT_OF_RESOURCES, MYF(0)); my_error(ER_OUT_OF_RESOURCES, MYF(0));
spcont->clear_handler(); spcont->clear_handler();
thd->spcont= spcont; thd->spcont= spcont;
...@@ -3316,7 +3316,7 @@ sp_instr_set_case_expr::exec_core(THD *thd, uint *nextp) ...@@ -3316,7 +3316,7 @@ sp_instr_set_case_expr::exec_core(THD *thd, uint *nextp)
sp_rcontext *spcont= thd->spcont; sp_rcontext *spcont= thd->spcont;
thd->spcont= 0; /* Avoid handlers */ thd->spcont= NULL; /* Avoid handlers */
my_error(ER_OUT_OF_RESOURCES, MYF(0)); my_error(ER_OUT_OF_RESOURCES, MYF(0));
spcont->clear_handler(); spcont->clear_handler();
thd->spcont= spcont; thd->spcont= spcont;
......
...@@ -126,7 +126,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, ...@@ -126,7 +126,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
sp_rcontext *spcont= thd->spcont; sp_rcontext *spcont= thd->spcont;
thd->no_warnings_for_error= 1; thd->no_warnings_for_error= 1;
thd->spcont= 0; thd->spcont= NULL;
thd->killed= THD::KILL_BAD_DATA; thd->killed= THD::KILL_BAD_DATA;
my_message(code, msg, MYF(0)); my_message(code, msg, MYF(0));
......
...@@ -982,7 +982,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, ...@@ -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); Lex_input_stream lip(thd, trg_create_str->str, trg_create_str->length);
thd->m_lip= &lip; thd->m_lip= &lip;
lex_start(thd); lex_start(thd);
thd->spcont= 0; thd->spcont= NULL;
int err= MYSQLparse((void *)thd); int err= MYSQLparse((void *)thd);
if (err || thd->is_fatal_error) if (err || thd->is_fatal_error)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment