diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
| commit | ecb6228c623cc2b239bf297e107225eaa4455d19 (patch) | |
| tree | d21225ac09b301f317ca89093128769a5ede9fbb /sql/sp.cc | |
| parent | aaf2e7a0037a529070e4721c615b87566a31f09e (diff) | |
| parent | 9e27ce325013f706526c7b2240498baf4cae4735 (diff) | |
| download | mariadb-git-ecb6228c623cc2b239bf297e107225eaa4455d19.tar.gz | |
Manual merge of mysql-next-mr-runtime upstream.
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 aec953988b9..f6bfba71726 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1711,6 +1711,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 |