bk commit into 5.0 tree (hezx:1.2613) BUG#35864

[hezx]

Below is the list of changes that have just been committed into a local
5.0 repository of hezx.  When hezx does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-22 13:08:31+08:00, hezx@stripped +1 -0
  BUG#35864 mysqltest command 'skip' does not expand variables
  
  mysqltest skip and die command do not expand variables in its arguments,
  this patch will enable variable expansion for these two commands

  client/mysqltest.c@stripped, 2008-04-22 13:08:25+08:00, hezx@stripped +23 -2
    expand variables for skip, die command

diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c	2008-03-24 01:53:33 +08:00
+++ b/client/mysqltest.c	2008-04-22 13:08:25 +08:00
@@ -3314,6 +3314,27 @@ int do_echo(struct st_command *command)
   DBUG_RETURN(0);
 }
 
+void do_skip(struct st_command *command)
+{
+  DYNAMIC_STRING ds_skip;
+  DBUG_ENTER("do_skip");
+
+  init_dynamic_string(&ds_skip, "", command->query_len, 256);
+  do_eval(&ds_skip, command->first_argument, command->end, FALSE);
+  abort_not_supported_test("%s", ds_skip.str);
+  /* will not be reached */
+}
+
+void do_die(struct st_command *command)
+{
+  DYNAMIC_STRING ds_die;
+  DBUG_ENTER("do_die");
+
+  init_dynamic_string(&ds_die, "", command->query_len, 256);
+  do_eval(&ds_die, command->first_argument, command->end, FALSE);
+  die("%s", ds_die.str);
+  /* will not be reached */
+}
 
 void do_wait_for_slave_to_stop(struct st_command *c __attribute__((unused)))
 {
@@ -7178,14 +7199,14 @@ int main(int argc, char **argv)
         break;
       case Q_DIE:
         /* Abort test with error code and error message */
-        die("%s", command->first_argument);
+	do_die(command);
         break;
       case Q_EXIT:
         /* Stop processing any more commands */
         abort_flag= 1;
         break;
       case Q_SKIP:
-        abort_not_supported_test("%s", command->first_argument);
+	do_skip(command);
         break;
 
       case Q_RESULT: