diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-30 15:28:52 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-30 15:28:52 +0530 |
| commit | 92209ac6f69974169c543ae82da077f06f2b7c71 (patch) | |
| tree | 1713781010a286fa9a493781a3eb001af062fd62 /sql/sys_vars.cc | |
| parent | 0e3170e30d2a4e8f1ed6fd4bbe935355f7370a34 (diff) | |
| parent | 725e47bfb524f4b1d29076c8777056bedd5f00ea (diff) | |
| download | mariadb-git-92209ac6f69974169c543ae82da077f06f2b7c71.tar.gz | |
Merge tag 'mariadb-10.0.31' into 10.0-galera
Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 6457a8597bd..4ae5379289e 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1681,7 +1681,10 @@ Sys_var_gtid_binlog_state::do_check(THD *thd, set_var *var) return true; } if (res->length() == 0) + { list= NULL; + list_len= 0; + } else if (!(list= gtid_parse_string_to_list(res->ptr(), res->length(), &list_len))) { |