5.3->5.5 merge

This commit is contained in:
Sergei Golubchik 2011-11-22 18:04:38 +01:00
commit d2755a2c9c
394 changed files with 17627 additions and 3353 deletions

View file

@ -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. */