database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch 'bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2017-08-26 00:34:43 +02:00
parent add44e684c c02d61bc11
commit bb8e99fdc3
570 changed files with 79204 additions and 12258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sp_rcontext.cc
View File

@@ -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=