summaryrefslogtreecommitdiff
path: root/sql/sp.cc
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2005-12-06 14:25:12 +0100
committerunknown <pem@mysql.com>2005-12-06 14:25:12 +0100
commit29eac312cda3bebddeb7f5ab7a2af6b81ea89205 (patch)
tree9f2d5bd1fe2755d671e93a72ba09a3d33e7266f8 /sql/sp.cc
parent47fe447536b84908e176db62ef821afee0f923ff (diff)
downloadmariadb-git-29eac312cda3bebddeb7f5ab7a2af6b81ea89205.tar.gz
Final review fix of #14233: Crash after tampering with the mysql.proc table.
Changed variable type and added comment in sp.c. sql/sp.cc: Changed variable type and added comment. (Review fix)
Diffstat (limited to 'sql/sp.cc')
-rw-r--r--sql/sp.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc
index 7dc872f6225..3e5a3cb94f1 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -1462,7 +1462,7 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
bool first_no_prelock, bool *tabs_changed)
{
int ret= 0;
- int tabschnd= 0; /* Set if tables changed */
+ bool tabschnd= 0; /* Set if tables changed */
bool first= TRUE;
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)
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)
{
char n[NAME_LEN*2+2];