summaryrefslogtreecommitdiff
path: root/sql/sp.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2006-05-04 15:58:30 +0300
committermonty@mysql.com <>2006-05-04 15:58:30 +0300
commit3ddc1f99564b0ba4dbd62f5b3801dcd5f164eaf2 (patch)
tree6d293225bed8f1e3ed7c0029fbbaa3056aeb1ff4 /sql/sp.cc
parent86b2be8d35d63437afcbc9458adc4c9c0f0def5a (diff)
parent1809adee6388a9c381d5cb714d3f3cfa3f98e591 (diff)
downloadmariadb-git-3ddc1f99564b0ba4dbd62f5b3801dcd5f164eaf2.tar.gz
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/sp.cc')
-rw-r--r--sql/sp.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc
index f7a6772146d..6f074fd7dce 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -268,7 +268,6 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, TABLE *table)
static int
db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp)
{
- extern int MYSQLparse(void *thd);
TABLE *table;
const char *params, *returns, *body;
int ret;
@@ -477,6 +476,7 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
(*sphp)->optimize();
}
end:
+ lex_end(thd->lex);
thd->spcont= old_spcont;
thd->variables.sql_mode= old_sql_mode;
thd->variables.select_limit= old_select_limit;