Bug #51590 mysqltest: --disable_abort_on_error does not work inside while/if

abort_on_error flag for stmt was set at initial parse
(Re)-set flag before execution instead, also added to test

1 files changed, 4 insertions, 3 deletions

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index d45f9acd87a..8ba1271e1fa 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -7571,9 +7571,6 @@ void get_command_type(struct st_command* command)
          sizeof(saved_expected_errors));
   DBUG_PRINT("info", ("There are %d expected errors",
                       command->expected_errors.count));
-  command->abort_on_error= (command->expected_errors.count == 0 &&
-                            abort_on_error);
-
   DBUG_VOID_RETURN;
 }
 
@@ -7918,6 +7915,10 @@ int main(int argc, char **argv)
       command->type= Q_COMMENT;
     }
 
+    /* (Re-)set abort_on_error for this command */
+    command->abort_on_error= (command->expected_errors.count == 0 &&
+                              abort_on_error);
+    
     /* delimiter needs to be executed so we can continue to parse */
     my_bool ok_to_do= cur_block->ok || command->type == Q_DELIMITER;
     /*