Additional fix for BUG#5907: Traditional mode: invalid value can be inserted via a stored procedure

... make the handler catch too.


mysql-test/r/strict.result:
  Updated corrected result for BUG#5907.
mysql-test/t/strict.test:
  Corrected test for BUG#5907.
sql/sp_head.cc:
  Make handlers catch certain bad data exceptions in strict mode too.

1 files changed, 5 insertions, 1 deletions

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 89c4b2dbaac..63f67959f33 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -561,7 +561,10 @@ sp_head::execute(THD *thd)
     // Check if an exception has occurred and a handler has been found
     // Note: We havo to check even if ret==0, since warnings (and some
     //       errors don't return a non-zero value.
-    if (!thd->killed && ctx)
+    //       We also have to check even if thd->killed != 0, since some
+    //       errors return with this even when a handler has been found
+    //       (e.g. "bad data").
+    if (ctx)
     {
       uint hf;
 
@@ -579,6 +582,7 @@ sp_head::execute(THD *thd)
 	ctx->clear_handler();
 	ctx->in_handler= TRUE;
         thd->clear_error();
+	thd->killed= THD::NOT_KILLED;
 	continue;
       }
     }