bk commit into 5.1 tree (dkatz:1.2562) BUG#29457

[damien]

Below is the list of changes that have just been committed into a local
5.1 repository of dkatz. When dkatz 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-07-31 16:08:59-04:00, dkatz@stripped +3 -0
  Bug #29457 mysql: -T option no longer works in 5.1
  
  In client/mysql.cc, changed option -T to be an alias for option --column-type-info instead of --debug-info. The reasoning behind the change is because most uses of -T is to get column information, not the debug information.

  client/client_priv.h@stripped, 2007-07-31 16:08:53-04:00, dkatz@stripped +1 -1
    Removed unused OPT_COLUMN_TYPES enum value.

  client/mysql.cc@stripped, 2007-07-31 16:08:53-04:00, dkatz@stripped +2 -2
    Changed option -T to be an alias for option --column-type-info instead of --debug-info.

  extra/comp_err.c@stripped, 2007-07-31 16:08:53-04:00, dkatz@stripped +1 -1
    Removed option -T as an alias for --debug-info. Apparently the alias was copied from client/mysql.cc.

diff -Nrup a/client/client_priv.h b/client/client_priv.h
--- a/client/client_priv.h	2007-04-18 22:47:49 -04:00
+++ b/client/client_priv.h	2007-07-31 16:08:53 -04:00
@@ -75,6 +75,6 @@ enum options_client
   OPT_SLAP_POST_QUERY,
   OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,
   OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
-  OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, OPT_WRITE_BINLOG,
+  OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE, OPT_WRITE_BINLOG,
   OPT_MAX_CLIENT_OPTION
 };
diff -Nrup a/client/mysql.cc b/client/mysql.cc
--- a/client/mysql.cc	2007-07-11 05:40:24 -04:00
+++ b/client/mysql.cc	2007-07-31 16:08:53 -04:00
@@ -597,7 +597,7 @@ static struct my_option my_long_options[
   {"character-sets-dir", OPT_CHARSETS_DIR,
    "Directory where character sets are.", (uchar**) &charsets_dir,
    (uchar**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"column-type-info", OPT_COLUMN_TYPES, "Display column type information.",
+  {"column-type-info", 'T', "Display column type information.",
    (uchar**) &column_types_flag, (uchar**) &column_types_flag,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"compress", 'C', "Use compression in server/client protocol.",
@@ -611,7 +611,7 @@ static struct my_option my_long_options[
   {"debug", '#', "Output debug log", (uchar**) &default_dbug_option,
    (uchar**) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #endif
-  {"debug-info", 'T', "Print some debug info at exit.", (uchar**) &info_flag,
+  {"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (uchar**) &info_flag,
    (uchar**) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"database", 'D', "Database to use.", (uchar**) &current_db,
    (uchar**) &current_db, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
diff -Nrup a/extra/comp_err.c b/extra/comp_err.c
--- a/extra/comp_err.c	2007-05-23 18:39:16 -04:00
+++ b/extra/comp_err.c	2007-07-31 16:08:53 -04:00
@@ -102,7 +102,7 @@ static struct my_option my_long_options[
   {"debug", '#', "Output debug log", (uchar**) & default_dbug_option,
    (uchar**) & default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #endif
-  {"debug-info", 'T', "Print some debug info at exit.", (uchar**) & info_flag,
+  {"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (uchar**) & info_flag,
    (uchar**) & info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"help", '?', "Displays this help and exits.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},