Bug #11754855 46528: NEED A WAY TO PASS A VARIABLE TO MTR COMMANDS

modified function do_get_error in mysqltest.cc to handle multiple variable passed
added test case to mysqltest.test to verify handling to multiple errors passed

1 files changed, 13 insertions, 1 deletions

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 915c6e4d495..f0184e5297b 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -4839,6 +4839,7 @@ void do_get_errcodes(struct st_command *command)
   struct st_match_err *to= saved_expected_errors.err;
   char *p= command->first_argument;
   uint count= 0;
+  char *next;
 
   DBUG_ENTER("do_get_errcodes");
 
@@ -4858,6 +4859,17 @@ void do_get_errcodes(struct st_command *command)
     while (*end && *end != ',' && *end != ' ')
       end++;
 
+    next=end;
+
+    /* code to handle variables passed to mysqltest */
+     if( *p == '$')
+     {
+        const char* fin;
+        VAR *var = var_get(p,&fin,0,0);
+        p=var->str_val;
+        end=p+var->str_val_len;
+     }
+
     if (*p == 'S')
     {
       char *to_ptr= to->code.sqlstate;
@@ -4932,7 +4944,7 @@ void do_get_errcodes(struct st_command *command)
       die("Too many errorcodes specified");
 
     /* Set pointer to the end of the last error code */
-    p= end;
+    p= next;
 
     /* Find next ',' */
     while (*p && *p != ',')