1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final review fix of #14233: Crash after tampering with the mysql.proc table.

Browse Source 
Changed variable type and added comment in sp.c.
This commit is contained in:
pem@mysql.com 2005-12-06 14:25:12 +01:00
parent a0ed1d5aba
commit c6fc5d35cc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sp.cc
View File

@ -1462,7 +1462,7 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
bool first_no_prelock, bool *tabs_changed) bool first_no_prelock, bool *tabs_changed)
{ {
int ret= 0; int ret= 0;
int tabschnd= 0; /* Set if tables changed */ bool tabschnd= 0; /* Set if tables changed */
bool first= TRUE; bool first= TRUE;
DBUG_ENTER("sp_cache_routines_and_add_tables_aux"); DBUG_ENTER("sp_cache_routines_and_add_tables_aux");
@ -1512,6 +1512,11 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
*/ */
if (ret == SP_PARSE_ERROR) if (ret == SP_PARSE_ERROR)
thd->clear_error(); thd->clear_error();
/*
If we cleared the parse error, or when db_find_routine() flagged
an error with it's return value without calling my_error(), we
set the generic "mysql.proc table corrupt" error here.
*/
if (!thd->net.report_error) if (!thd->net.report_error)
{ {
char n[NAME_LEN*2+2]; char n[NAME_LEN*2+2];