diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-06 23:41:18 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-06 23:41:18 +0200 |
| commit | 873963d4cacbceca05881b4adc6dbbae6c64e0d9 (patch) | |
| tree | 8004cb532c51b6a2c9f603271702236358f167cb /mysys | |
| parent | e578a2e23142b863db9c95ebe1d3459c84cfabfe (diff) | |
| parent | 4d710469be9b534825fee784c8cdaba7bbe6f626 (diff) | |
| download | mariadb-git-873963d4cacbceca05881b4adc6dbbae6c64e0d9.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
strings/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index a28d3dd4e3c..5ec26e3de3f 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <my_config.h> #include <my_global.h> #include <m_string.h> #include <stdlib.h> @@ -452,7 +451,7 @@ static void init_variables(const struct my_option *options) { if (options->var_type == GET_LONG) *((long*) options->u_max_value)= *((long*) options->value)= - options->def_value; + (long) options->def_value; else if (options->var_type == GET_LL) *((longlong*) options->u_max_value)= *((longlong*) options->value)= options->def_value; |