summaryrefslogtreecommitdiff
path: root/sql/sp.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-11-19 22:33:47 +0100
committerunknown <knielsen@knielsen-hq.org>2010-11-19 22:33:47 +0100
commit95b37a254b0797499b4a940ca8eb8fa907a7664f (patch)
treebcd57843b07d10746160f485e039446bf4bd616e /sql/sp.cc
parent01d41622ba4cdb99327f98d0d1c1772ad842c66a (diff)
parenta967802ae94e1b0ce75436648446621a381838e7 (diff)
downloadmariadb-git-95b37a254b0797499b4a940ca8eb8fa907a7664f.tar.gz
Merge MariaDB 5.1->5.2
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 ebf2b3c360d..68e2f19fd47 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -785,7 +785,7 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
{
Parser_state parser_state;
- if (parser_state.init(thd, defstr.c_ptr(), defstr.length()))
+ if (parser_state.init(thd, defstr.c_ptr_safe(), defstr.length()))
{
ret= SP_INTERNAL_ERROR;
goto end;