diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-22 12:23:39 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-22 12:23:39 +0200 |
| commit | 985d2d393c285ecd4539cb579b680f7b91fdaa1a (patch) | |
| tree | 8cabf6c09758c30df04de96ca98c7827d5665493 /client/mysqladmin.cc | |
| parent | a76a2522ec4f8c069827e038997387a8b8eb3a3a (diff) | |
| parent | 461cf3e5a3c2d346d75b1407b285f8daf9d01f67 (diff) | |
| download | mariadb-git-985d2d393c285ecd4539cb579b680f7b91fdaa1a.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 7e824cadf40..bd80dd01a1e 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -299,8 +299,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), #endif break; case OPT_MYSQL_PROTOCOL: - opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib, - opt->name); + if ((opt_protocol= find_type_with_warning(argument, &sql_protocol_typelib, + opt->name)) <= 0) + { + sf_leaking_memory= 1; /* no memory leak reports here */ + exit(1); + } break; } return 0; |