diff options
| author | unknown <serg@janus.mylan> | 2007-10-13 20:25:53 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-10-13 20:25:53 +0200 |
| commit | f1d92c4397bd848b5c761cfcbf3a1d195934c03d (patch) | |
| tree | b58b6594683ec0438044674077e9c33d6861516d /client | |
| parent | 85a920dd41692e3580ac19541ac2072b34901a85 (diff) | |
| download | mariadb-git-f1d92c4397bd848b5c761cfcbf3a1d195934c03d.tar.gz | |
my_getopt: enforce "correctness" (min/max/block_size) of default values
client/mysqltest.c:
fix my_option's with incorrect defaults
mysql-test/r/maria.result:
update results
mysql-test/t/variables.test:
update results
sql/mysqld.cc:
fix my_option's with incorrect defaults
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index fdee137fa98..558763f7cff 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2018,9 +2018,9 @@ void var_set_query_get_value(struct st_command *command, VAR *var) static DYNAMIC_STRING ds_col; static DYNAMIC_STRING ds_row; const struct command_arg query_get_value_args[] = { - "query", ARG_STRING, TRUE, &ds_query, "Query to run", - "column name", ARG_STRING, TRUE, &ds_col, "Name of column", - "row number", ARG_STRING, TRUE, &ds_row, "Number for row", + {"query", ARG_STRING, TRUE, &ds_query, "Query to run"}, + {"column name", ARG_STRING, TRUE, &ds_col, "Name of column"}, + {"row number", ARG_STRING, TRUE, &ds_row, "Number for row"}, }; DBUG_ENTER("var_set_query_get_value"); @@ -5007,7 +5007,7 @@ static struct my_option my_long_options[] = "Don't use the memory allocation checking.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"sleep", 'T', "Sleep always this many seconds on sleep commands.", - (uchar**) &opt_sleep, (uchar**) &opt_sleep, 0, GET_INT, REQUIRED_ARG, -1, 0, 0, + (uchar**) &opt_sleep, (uchar**) &opt_sleep, 0, GET_INT, REQUIRED_ARG, -1, -1, 0, 0, 0, 0}, {"socket", 'S', "Socket file to use for connection.", (uchar**) &unix_sock, (uchar**) &unix_sock, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, |