diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 14:51:21 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 14:51:21 +0400 |
| commit | b497e2c6b2155bfdc4fc63b0f80eba9a5062a02e (patch) | |
| tree | 0a5326c23c1d2ab3752bcf621639494ca7c16fc1 /sql/sp.cc | |
| parent | 5bace3f049de457ddbeb3a1946089c0f4c479229 (diff) | |
| parent | 779e2a968632a5e73c660307892ca6a868399dfc (diff) | |
| download | mariadb-git-b497e2c6b2155bfdc4fc63b0f80eba9a5062a02e.tar.gz | |
Manual merge from the bugfix tree.
conflicts:
conflict sql/sql_parse.cc
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index e0c1fcfa378..ddddaee2e10 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -782,7 +782,12 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, thd->spcont= NULL; { - Parser_state parser_state(thd, defstr.c_ptr(), defstr.length()); + Parser_state parser_state; + if (parser_state.init(thd, defstr.c_ptr(), defstr.length())) + { + ret= SP_INTERNAL_ERROR; + goto end; + } lex_start(thd); |