diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-07 11:30:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-07 11:30:03 +0200 |
| commit | 9e11e055ce1461caecbb30e8300dfdcd48af22f1 (patch) | |
| tree | 48f5dc07a29e44a106c37e7e8e3234c62abbebf6 /client/mysqldump.c | |
| parent | 2b5c9bc2c813ea7963959e515da5d60392c35431 (diff) | |
| parent | 6b99859fff6b8c0a52ea45965834c9c3fdfc4cb3 (diff) | |
| download | mariadb-git-9e11e055ce1461caecbb30e8300dfdcd48af22f1.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index ca47f89268e..aead4caf506 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -92,8 +92,7 @@ static void add_load_option(DYNAMIC_STRING *str, const char *option, const char *option_value); -static ulong find_set(TYPELIB *lib, const char *x, size_t length, - char **err_pos, uint *err_len); +static ulong find_set(TYPELIB *, const char *, size_t, char **, uint *); static char *alloc_query_str(ulong size); static void field_escape(DYNAMIC_STRING* in, const char *from); @@ -5471,7 +5470,7 @@ static ulong find_set(TYPELIB *lib, const char *x, size_t length, var_len= (uint) (pos - start); strmake(buff, start, MY_MIN(sizeof(buff) - 1, var_len)); find= find_type(buff, lib, FIND_TYPE_BASIC); - if (!find) + if (find <= 0) { *err_pos= (char*) start; *err_len= var_len; |