bk commit into 4.1 tree (msvensson:1.2634)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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, 2007-04-04 15:15:40+02:00, msvensson@stripped +1 -0
  Add "skip" function, makeing mysqltest return an
  error code indicating test should be skipped

  client/mysqltest.c@stripped, 2007-04-04 15:15:40+02:00, msvensson@stripped +5 -1
    Add "skip" function, makeing mysqltest return an
    error code indicating test should be skipped

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.248/client/mysqltest.c	2007-04-04 15:09:08 +02:00
+++ 1.249/client/mysqltest.c	2007-04-04 15:15:40 +02:00
@@ -276,7 +276,7 @@ enum enum_commands {
   Q_IF,
   Q_DISABLE_PARSING, Q_ENABLE_PARSING,
   Q_REPLACE_REGEX, Q_REMOVE_FILE, Q_FILE_EXIST,
-  Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT,
+  Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, Q_SKIP,
   Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES,
 
   Q_UNKNOWN,			       /* Unknown command.   */
@@ -358,6 +358,7 @@ const char *command_names[]=
   "die",
   /* Don't execute any more commands, compare result */
   "exit",
+  "skip",
   "chmod",
   "append_file",
   "cat_file",
@@ -6257,6 +6258,9 @@ int main(int argc, char **argv)
       case Q_EXIT:
         /* Stop processing any more commands */
         abort_flag= 1;
+        break;
+      case Q_SKIP:
+        abort_not_supported_test("%s", command->first_argument);
         break;
 
       case Q_RESULT: