Commit 26f9af9f authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
parents 3f3d9093 72413cb6

client/mysqlslap.c

+5 −5
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static struct my_option my_long_options[] = 
    "Load types are mixed, write, or read. Default is mixed\n",

    (gptr*) &auto_generate_sql_type, (gptr*) &auto_generate_sql_type,

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

  {"auto-generate-sql-write_number", OPT_SLAP_AUTO_GENERATE_WRITE_NUM,

  {"auto-generate-sql-write-number", OPT_SLAP_AUTO_GENERATE_WRITE_NUM,

    "Number of rows to insert to used in read and write loads (default is 100).\n",

    (gptr*) &auto_generate_sql_number, (gptr*) &auto_generate_sql_number,

    0, GET_ULL, REQUIRED_ARG, 100, 0, 0, 0, 0, 0},
@@ -439,13 +439,13 @@ static struct my_option my_long_options[] = 
    (gptr*) &lock_directory, (gptr*) &lock_directory, 0, GET_STR, 

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

  {"number-char-cols", 'x', 

    "Number of INT columns to create table with if specifying --auto-generate-sql.",

    "Number of VARCHAR columns to create table with if specifying --auto-generate-sql ",

    (gptr*) &num_char_cols, (gptr*) &num_char_cols, 0, GET_UINT, REQUIRED_ARG,

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

  {"number-int-cols", 'y', 

    "Number of VARCHAR columns to create table with if specifying "

      "--auto-generate-sql.", (gptr*) &num_int_cols, (gptr*) &num_int_cols, 0,

    GET_UINT, REQUIRED_ARG, 1, 0, 0, 0, 0, 0},

    "Number of INT columns to create table with if specifying --auto-generate-sql.",

    (gptr*) &num_int_cols, (gptr*) &num_int_cols, 0, GET_UINT, REQUIRED_ARG, 

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

  {"number-of-queries", OPT_MYSQL_NUMBER_OF_QUERY, 

    "Limit each client to this number of queries (this is not exact).",

    (gptr*) &num_of_query, (gptr*) &num_of_query, 0,