diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-11-20 17:18:37 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-11-20 17:18:37 +0300 |
| commit | d51a4fae328044f6b796ad8405dbb0dc3c653762 (patch) | |
| tree | 126efa7bce0c3c70a1d3c3cb0099c6615f951e39 /sql/sp.cc | |
| parent | ca595821498d6a547fa1780df86cdf127b0019b3 (diff) | |
| parent | ecb6228c623cc2b239bf297e107225eaa4455d19 (diff) | |
| download | mariadb-git-d51a4fae328044f6b796ad8405dbb0dc3c653762.tar.gz | |
Merge with next-mr
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index f756e8ddb18..23cdb1ac7a7 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1716,6 +1716,9 @@ 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 |