summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-12-08 18:08:48 +0100
committerunknown <knielsen@knielsen-hq.org>2011-12-08 18:08:48 +0100
commit943af08c800c326ab1a2a5482b797cfb7821d7d3 (patch)
treedcf901be957bc4fcae74becc5dd8781eaf8d65d9
parent5e7b949e61f4330e27013c8ec81fa3d450e5dce6 (diff)
downloadmariadb-git-943af08c800c326ab1a2a5482b797cfb7821d7d3.tar.gz
Fix valgrind error after 5.5 merge (the 5.3 fix was accidentally lost in the merge).
-rw-r--r--sql/sp.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc
index 56827d410b7..31cbe13a96e 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -732,7 +732,7 @@ static sp_head *sp_compile(THD *thd, String *defstr, ulonglong sql_mode,
thd->variables.sql_mode= sql_mode;
thd->variables.select_limit= HA_POS_ERROR;
- if (parser_state.init(thd, defstr->c_ptr(), defstr->length()))
+ if (parser_state.init(thd, defstr->c_ptr_safe(), defstr->length()))
{
thd->variables.sql_mode= old_sql_mode;
thd->variables.select_limit= old_select_limit;