diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
| commit | bb8e99fdc367a470c6195a2ae4c33f273fe55a25 (patch) | |
| tree | 3b3bcacec8faab66bf6756f20dff1e45462fdc1c /sql/sp_rcontext.cc | |
| parent | add44e684cb9f1b46d1d5facdf6255360fa7b656 (diff) | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| download | mariadb-git-bb8e99fdc367a470c6195a2ae4c33f273fe55a25.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index c3fc596d9ec..6b418e9e387 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -534,8 +534,7 @@ bool sp_rcontext::handle_sql_condition(THD *thd, /* Reset error state. */ thd->clear_error(); - thd->killed= NOT_KILLED; // Some errors set thd->killed - // (e.g. "bad data"). + thd->reset_killed(); // Some errors set thd->killed, (e.g. "bad data"). /* Add a frame to handler-call-stack. */ Sql_condition_info *cond_info= |