diff options
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 2 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 2fecbe1c66f..8c412f88ac7 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -737,7 +737,7 @@ static void mysql_read_default_options(struct st_mysql_options *options, *end=0; /* Remove '=' */ } /* Change all '_' in variable name to '-' */ - for (end= *option ; (end= strcend(end,'_')) && *end ; ) + for (end= *option ; *(end= strcend(end,'_')) ; ) *end= '-'; switch (find_type(*option+2,&option_types,2)) { case 1: /* port */ diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index c421d3b5578..ca546051290 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -193,7 +193,7 @@ static struct my_option my_long_options[] = 0, 0, 0, GET_NO_ARG, NO_ARG, 'i', 0, 0, 0, 0, 0, 0}, {"keys-used", "Tell MyISAM to update only some specific keys. # is a bit mask of which keys to use. This can be used to get faster inserts!", (gptr*) &check_param.keys_in_use, (gptr*) &check_param.keys_in_use, 0, - GET_LL, REQUIRED_ARG, 'k', -1LL, 0, 0, 0, 0, 0}, + GET_LL, REQUIRED_ARG, 'k',-1, 0, 0, 0, 0, 0}, {"medium-check", "Faster than extended-check, but only finds 99.99% of all errors. Should be good enough for most cases.", 0, 0, 0, GET_NO_ARG, NO_ARG, 'm', 0, 0, 0, 0, 0, 0}, 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; |