diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-13 13:26:16 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-13 13:26:16 +0100 |
| commit | 63546824fc0d52ba86820b1d178dc537b5f718ee (patch) | |
| tree | 5351c4626f402917a764b36f5e0825b90264f258 /mysys | |
| parent | 91916e7f054f4afd33bfda327a45589f2e2b7f16 (diff) | |
| parent | 780871d8b90fe3146db39b4be65ebedb309b9f9b (diff) | |
| download | mariadb-git-63546824fc0d52ba86820b1d178dc537b5f718ee.tar.gz | |
automerge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 4 | ||||
| -rw-r--r-- | mysys/typelib.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 22b1216f99c..f444e0f0c94 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -1041,9 +1041,11 @@ static void init_one_value(const struct my_option *option, uchar* *variable, *((longlong*) variable)= (longlong) getopt_ll_limit_value((longlong) value, option, NULL); break; case GET_ULL: - case GET_SET: *((ulonglong*) variable)= (ulonglong) getopt_ull_limit_value((ulonglong) value, option, NULL); break; + case GET_SET: + *((ulonglong*) variable)= (ulonglong) value; + break; case GET_DOUBLE: *((double*) variable)= (double) value; break; diff --git a/mysys/typelib.c b/mysys/typelib.c index 92ffe9316ff..a0fe8a96a89 100644 --- a/mysys/typelib.c +++ b/mysys/typelib.c @@ -182,7 +182,10 @@ my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err) { (*err)++; i= x; - while (*x && *x != field_separator) x++; + while (*x && *x != field_separator) + x++; + if (x[0] && x[1]) // skip separator if found + x++; if ((find= find_type(i, lib, 2 | 8) - 1) < 0) DBUG_RETURN(0); result|= (ULL(1) << find); |