diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
| commit | 29acdcd5427e13bc3aefbbeee17b42bfe23dea84 (patch) | |
| tree | f8f5365594c3b43e01891b7017f47fa6b934c646 /client/mysqldump.c | |
| parent | e33bda183e80ff63a984ed2a938467950b23a3fd (diff) | |
| parent | daec0004502a1f8c2ff7d46de92a61b5c4da1d6c (diff) | |
| download | mariadb-git-MDEV-9804.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804
Conflicts:
VERSION
debian/mariadb-backup-10.2.files
debian/mariadb-backup-10.2.install
debian/mariadb-backup-10.3.files
mysql-test/unstable-tests
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 2028606cd5a..c8ebd2217a3 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); @@ -5485,7 +5484,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; |