diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-07-01 10:14:55 +0300 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-07-01 10:14:55 +0300 |
| commit | 4b1f9b1ae3dee4bdb8c8b6ff4ec39d55243937ab (patch) | |
| tree | 3e90549906633c133f3c16694d86be1cc75c1076 /mysys/my_getopt.c | |
| parent | 2bdf7fba3db541120b66e4aa705843e359f64c2e (diff) | |
| parent | 039c6b1bae117b81701ce764aa84eeea905b283c (diff) | |
| download | mariadb-git-4b1f9b1ae3dee4bdb8c8b6ff4ec39d55243937ab.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
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysys/my_getopt.c')
| -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 9583b5a72c3..753b1990218 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; |