BUG#13687542 : MTR BEHAVES WRONG WHEN EXECUTING 'ERROR $VAR' IN A LOOP

Pavan Naik · Pavan Naik · commit ad5235cc95d9 · 2016-02-02T14:25:43.000+05:30
Description :
=============
MTR's 'error' command can be used when a statement is expected to fail.
It is possible to give the error code either hard-coded or as an mtr variable,
like: --error $variable.

However, if an 'error $variable' statement is inside a loop, it evaluates
to the same value every iteration.

Issue :
=======
'expected_errors' array was not getting updated with the 'error' command
value after the first iteration.

Fix :
=====
Check for 'error' command and update the 'expected_errors' array for each
iteration of the loop.

Reviewed-by: Sayantan Dutta &lt;sayantan.dutta@oracle.com&gt;
RB: 11463
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -8392,6 +8392,13 @@ void get_command_type(struct st_command* command)
           "use # if you intended to write a comment");
     }
   }
+  DBUG_VOID_RETURN;
+}
+
+
+void update_expected_errors(struct st_command* command)
+{
+  DBUG_ENTER("update_expected_errors");
 
   /* Set expected error on command */
   memcpy(&command->expected_errors, &saved_expected_errors,
@@ -8771,6 +8778,9 @@ int main(int argc, char **argv)
     if (command->type == Q_UNKNOWN || command->type == Q_COMMENT_WITH_COMMAND)
       get_command_type(command);
 
+    if(saved_expected_errors.count > 0)
+      update_expected_errors(command);
+
     if (parsing_disabled &&
         command->type != Q_ENABLE_PARSING &&
         command->type != Q_DISABLE_PARSING)
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
@@ -244,6 +244,12 @@ mysqltest: At line 1: Unknown SQL error name 'E9999'
 mysqltest: At line 1: Invalid argument to error: '999e9' - the errno may only consist of digits[0-9]
 mysqltest: At line 1: Invalid argument to error: '9b' - the errno may only consist of digits[0-9]
 mysqltest: At line 1: Too many errorcodes specified
+CREATE TABLE t1 (a INT);
+CREATE TABLE t1 (a INT);
+ERROR 42S01: Table 't1' already exists
+CREATE TABLE t1 (a INT);
+ERROR 42S01: Table 't1' already exists
+DROP TABLE t1;
 MySQL
 "MySQL"
 MySQL: The world''s most popular open source database
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
@@ -710,6 +710,18 @@ remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
 --error 1
 --exec echo "--error 1,2,3,4,5,6,7,8,9,10,11" | $MYSQL_TEST 2>&1
 
+# BUG#13687542 MTR BEHAVES WRONG WHEN EXECUTING 'ERROR $VAR' IN A LOOP
+--let $i= 0
+--let $error= 0
+while ($i < 3)
+{
+  --error $error
+  CREATE TABLE t1 (a INT);
+  --let $error= 1050
+  --inc $i
+}
+
+DROP TABLE t1;
 
 # ----------------------------------------------------------------------------
 # Test echo command
