diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-12-16 09:49:16 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-12-16 09:49:16 +0100 |
| commit | a2a4c70c1bfd077a1281604bdd8368dd32ab6e83 (patch) | |
| tree | b2d3e2437e6035344c65d7b33d31455bc8ebfb28 /mysys | |
| parent | a893a64e2342eb4d179db46c5f85d4c86c45a4ed (diff) | |
| parent | 5cd3dffebb2abd5778e819ac57001e0d963484d8 (diff) | |
| download | mariadb-git-a2a4c70c1bfd077a1281604bdd8368dd32ab6e83.tar.gz | |
Merge to latest mysql-next-mr
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/.cvsignore | 10 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 22 | ||||
| -rw-r--r-- | mysys/my_sync.c | 4 | ||||
| -rw-r--r-- | mysys/typelib.c | 2 |
4 files changed, 14 insertions, 24 deletions
diff --git a/mysys/.cvsignore b/mysys/.cvsignore deleted file mode 100644 index 056ecc2691c..00000000000 --- a/mysys/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -st35l1t6 -test_charset -test_thr_alarm -test_thr_lock -test_vsnprintf -testhash diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 2e8f09f14fd..0b774975851 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -438,17 +438,17 @@ invalid value '%s'", else if (optp->arg_type == OPT_ARG && (((optp->var_type & GET_TYPE_MASK) == GET_BOOL) || (optp->var_type & GET_TYPE_MASK) == GET_ENUM)) - { - if (optend == disabled_my_option) - *((my_bool*) value)= (my_bool) 0; - else - { - if (!optend) /* No argument -> enable option */ - *((my_bool*) value)= (my_bool) 1; - else - argument= optend; - } - } + { + if (optend == disabled_my_option) + init_one_value(optp, value, 0); + else + { + if (!optend) /* No argument -> enable option */ + init_one_value(optp, value, 1); + else + argument= optend; + } + } else if (optp->arg_type == REQUIRED_ARG && !optend) { /* Check if there are more arguments after this one, diff --git a/mysys/my_sync.c b/mysys/my_sync.c index 7b2112fa032..6497ae59159 100644 --- a/mysys/my_sync.c +++ b/mysys/my_sync.c @@ -103,11 +103,11 @@ static const char cur_dir_name[]= {FN_CURLIB, 0}; int my_sync_dir(const char *dir_name, myf my_flags) { #ifdef NEED_EXPLICIT_SYNC_DIR - DBUG_ENTER("my_sync_dir"); - DBUG_PRINT("my",("Dir: '%s' my_flags: %d", dir_name, my_flags)); File dir_fd; int res= 0; const char *correct_dir_name; + DBUG_ENTER("my_sync_dir"); + DBUG_PRINT("my",("Dir: '%s' my_flags: %d", dir_name, my_flags)); /* Sometimes the path does not contain an explicit directory */ correct_dir_name= (dir_name[0] == 0) ? cur_dir_name : dir_name; /* diff --git a/mysys/typelib.c b/mysys/typelib.c index a0fe8a96a89..cb72c91e20d 100644 --- a/mysys/typelib.c +++ b/mysys/typelib.c @@ -184,7 +184,7 @@ my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err) i= x; while (*x && *x != field_separator) x++; - if (x[0] && x[1]) // skip separator if found + if (x[0] && x[1]) /* skip separator if found */ x++; if ((find= find_type(i, lib, 2 | 8) - 1) < 0) DBUG_RETURN(0); |