diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-25 10:25:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-25 10:25:48 +0200 |
| commit | 27412877dbcf601676f4515a99b2abee1f19623b (patch) | |
| tree | 2cb1a2e1a58ba10f2a96fcdec43f5ed77c326fd0 /sql/sp_rcontext.cc | |
| parent | f2033df6ac0f64664d9aad2d56fdd74f4bf9d666 (diff) | |
| parent | a544225d0a772bd4b67c96f5861ecc0ef7e69bba (diff) | |
| download | mariadb-git-27412877dbcf601676f4515a99b2abee1f19623b.tar.gz | |
Merge branch '10.2' into bb-10.2-ext
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 3ceba42b0e4..a684265ee66 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= |