diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-07-10 20:19:36 +0300 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-07-10 20:19:36 +0300 |
| commit | 2998b25478c06fa5b3412adf16e5fa4e200b8855 (patch) | |
| tree | 7f10c1441d1594747ee8805aa17739bfaa15ef17 /mysys | |
| parent | b5d63780ff3a1b2b6dcbd8c2675a2466297e6813 (diff) | |
| parent | baa8486e52e3eb5dbfdc51607a4fcd5cfbe835f2 (diff) | |
| download | mariadb-git-2998b25478c06fa5b3412adf16e5fa4e200b8855.tar.gz | |
Merge work:/home/bk/mysql-4.0/
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0-new
mysys/my_getopt.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index f8ad3ad9ce3..b0eb8a8b2e5 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -620,32 +620,32 @@ static void init_variables(const struct my_option *options) { switch (options->var_type) { case GET_BOOL: - *((my_bool*) options->u_max_value)= *((my_bool*) options->value)= - (my_bool) options->def_value; + *((my_bool*) options->u_max_value)= (my_bool) options->max_value; + *((my_bool*) options->value)= (my_bool) options->def_value; break; case GET_INT: - *((int*) options->u_max_value)= *((int*) options->value)= - (int) options->def_value; + *((int*) options->u_max_value)= (int) options->max_value; + *((int*) options->value)= (int) options->def_value; break; case GET_UINT: - *((uint*) options->u_max_value)= *((uint*) options->value)= - (uint) options->def_value; + *((uint*) options->u_max_value)= (uint) options->max_value; + *((uint*) options->value)= (uint) options->def_value; break; case GET_LONG: - *((long*) options->u_max_value)= *((long*) options->value)= - (long) options->def_value; + *((long*) options->u_max_value)= (long) options->max_value; + *((long*) options->value)= (long) options->def_value; break; case GET_ULONG: - *((ulong*) options->u_max_value)= *((ulong*) options->value)= - (ulong) options->def_value; + *((ulong*) options->u_max_value)= (ulong) options->max_value; + *((ulong*) options->value)= (ulong) options->def_value; break; case GET_LL: - *((longlong*) options->u_max_value)= *((longlong*) options->value)= - (longlong) options->def_value; + *((longlong*) options->u_max_value)= (longlong) options->max_value; + *((longlong*) options->value)= (longlong) options->def_value; break; case GET_ULL: - *((ulonglong*) options->u_max_value)= *((ulonglong*) options->value)= - (ulonglong) options->def_value; + *((ulonglong*) options->u_max_value)= (ulonglong) options->max_value; + *((ulonglong*) options->value)= (ulonglong) options->def_value; break; default: /* dummy default to avoid compiler warnings */ break; |