diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
| commit | ffc8f62b08982cc1f2fabf8b4b38bd124c115a97 (patch) | |
| tree | da42637b1ae9402a7436b715f9c0db57cdddc87a /sql/sp.cc | |
| parent | 6b157f6be3cb056a93eb925df3880098c871b32a (diff) | |
| parent | 0fc39acb8125fae95062e7b680b022b075a308c3 (diff) | |
| download | mariadb-git-ffc8f62b08982cc1f2fabf8b4b38bd124c115a97.tar.gz | |
merge 5.1->5.2
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 66a2f703df3..4d4b9728aad 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1902,6 +1902,10 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex, ret= SP_OK; break; default: + /* Query might have been killed, don't set error. */ + if (thd->killed) + break; + /* Any error when loading an existing routine is either some problem with the mysql.proc table, or a parse error because the contents |