mirror of
https://github.com/MariaDB/server.git
synced 2026-04-29 11:45:32 +02:00
5.3->5.5 merge
This commit is contained in:
commit
d2755a2c9c
394 changed files with 17627 additions and 3353 deletions
|
|
@ -419,7 +419,7 @@ sp_rcontext::activate_handler(THD *thd,
|
|||
/* Reset error state. */
|
||||
|
||||
thd->clear_error();
|
||||
thd->killed= THD::NOT_KILLED; // Some errors set thd->killed
|
||||
thd->killed= NOT_KILLED; // Some errors set thd->killed
|
||||
// (e.g. "bad data").
|
||||
|
||||
/* Return IP of the activated SQL handler. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue