Commit 4bbec092 authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
parents 93cbaf03 d3605294

client/mysqldump.c

+13 −12
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ static struct my_option my_long_options[] = 
  {"character-sets-dir", OPT_CHARSETS_DIR,

   "Directory where character sets are", (gptr*) &charsets_dir,

   (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"comments", 'i', "Write additional information.",

   (gptr*) &opt_comments, (gptr*) &opt_comments, 0, GET_BOOL, NO_ARG,

   1, 0, 0, 0, 0, 0},

  {"complete-insert", 'c', "Use complete insert statements.", (gptr*) &cFlag,

   (gptr*) &cFlag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"compress", 'C', "Use compression in server/client protocol.",
@@ -166,6 +169,9 @@ static struct my_option my_long_options[] = 
   0, 0, 0, 0, 0, 0},

  {"help", '?', "Display this help message and exit.", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"hex-blob", OPT_HEXBLOB, "Dump binary strings (CHAR BINARY, "

    "VARCHAR BINARY, BLOB) in hexadecimal format.",

   (gptr*) &opt_hex_blob, (gptr*) &opt_hex_blob, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"host", 'h', "Connect to host.", (gptr*) &current_host,

   (gptr*) &current_host, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"lines-terminated-by", OPT_LTB, "Lines in the i.file are terminated by ...",
@@ -180,10 +186,6 @@ static struct my_option my_long_options[] = 
   "Wrap tables with autocommit/commit statements.",

   (gptr*) &opt_autocommit, (gptr*) &opt_autocommit, 0, GET_BOOL, NO_ARG,

   0, 0, 0, 0, 0, 0},

  {"single-transaction", OPT_TRANSACTION,

   "Dump all tables in single transaction to get consistent snapshot. Mutually exclusive with --lock-tables.",

   (gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0, GET_BOOL, NO_ARG,

   0, 0, 0, 0, 0, 0},

  {"no-create-db", 'n',

   "'CREATE DATABASE /*!32312 IF NOT EXISTS*/ db_name;' will not be put in the output. The above line will be added otherwise, if --databases or --all-databases option was given.}",

   (gptr*) &opt_create_db, (gptr*) &opt_create_db, 0, GET_BOOL, NO_ARG, 0, 0,
@@ -192,9 +194,6 @@ static struct my_option my_long_options[] = 
   (gptr*) &tFlag, (gptr*) &tFlag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"no-data", 'd', "No row information.", (gptr*) &dFlag, (gptr*) &dFlag, 0,

   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"set-variable", 'O',

   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"opt", OPT_OPTIMIZE,

   "Same as --add-drop-table --add-locks --all --quick --extended-insert --lock-tables --disable-keys",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -216,6 +215,13 @@ static struct my_option my_long_options[] = 
  {"result-file", 'r',

   "Direct output to a given file. This option should be used in MSDOS, because it prevents new line '\\n' from being converted to '\\r\\n' (carriage return + line feed).",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"set-variable", 'O',

   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"single-transaction", OPT_TRANSACTION,

   "Dump all tables in single transaction to get consistent snapshot. Mutually exclusive with --lock-tables.",

   (gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0, GET_BOOL, NO_ARG,

   0, 0, 0, 0, 0, 0},

  {"socket", 'S', "Socket file to use for connection.",

   (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -246,11 +252,6 @@ static struct my_option my_long_options[] = 
    (gptr*) &opt_net_buffer_length, (gptr*) &opt_net_buffer_length, 0,

    GET_ULONG, REQUIRED_ARG, 1024*1024L-1025, 4096, 16*1024L*1024L,

    MALLOC_OVERHEAD-1024, 1024, 0},

  {"comments", 'i', "Write additional information.",

   (gptr*) &opt_comments, (gptr*) &opt_comments, 0, GET_BOOL, NO_ARG,

   1, 0, 0, 0, 0, 0},

  {"hex-blob", OPT_HEXBLOB, "Dump BLOBs in HEX.",

   (gptr*) &opt_hex_blob, (gptr*) &opt_hex_blob, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};