bk commit into 5.0 tree (paul:1.2052)

[paul]

Below is the list of changes that have just been committed into a local
5.0 repository of paul. When paul 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
  1.2052 06/02/16 10:00:14 paul@stripped +1 -0
  mysqlcheck.c:
    Fix out of order options.

  client/mysqlcheck.c
    1.54 06/02/16 09:59:46 paul@stripped +4 -4
    Fix out of order options.

# 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:	paul
# Host:	snake-hub.snake.net
# Root:	/src/extern/MySQL/bk/mysql-5.0

--- 1.53/client/mysqlcheck.c	2005-12-04 12:55:14 -06:00
+++ 1.54/client/mysqlcheck.c	2006-02-16 09:59:46 -06:00
@@ -146,14 +146,14 @@
 #include <sslopt-longopts.h>
   {"tables", OPT_TABLES, "Overrides option --databases (-B).", 0, 0, 0,
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DONT_ALLOW_USER_CHANGE
-  {"user", 'u', "User for login if not current user.", (gptr*) &current_user,
-   (gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"use-frm", OPT_FRM,
    "When used with REPAIR, get table structure from .frm file, so the table can be
repaired even if .MYI header is corrupted.",
    (gptr*) &opt_frm, (gptr*) &opt_frm, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
    0},
+#ifndef DONT_ALLOW_USER_CHANGE
+  {"user", 'u', "User for login if not current user.", (gptr*) &current_user,
+   (gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"verbose", 'v', "Print info about the various stages.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
   {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,