diff options
| author | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
| commit | fbab79c9b8a58b90292e900cf46ab6d6632ebb68 (patch) | |
| tree | 49738ad2561489954fa0973d82be10fafbf42e0b /extra | |
| parent | afbb72b3b6988f4c5242d46588754517724b2950 (diff) | |
| parent | aed2050e40cb332d54e8d40eb7242309b962c4e1 (diff) | |
| download | mariadb-git-fbab79c9b8a58b90292e900cf46ab6d6632ebb68.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
cmake/make_dist.cmake.in
mysql-test/r/func_json.result
mysql-test/r/ps.result
mysql-test/t/func_json.test
mysql-test/t/ps.test
sql/item_cmpfunc.h
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index bd73322dcaf..04e33fa389e 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -1421,8 +1421,12 @@ xb_get_one_option(int optid, case OPT_PROTOCOL: if (argument) { - 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; #include "sslopt-case.h" |