diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 18:09:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 18:09:08 +0300 |
| commit | 9216114ce729733e6b0c4ce952bfdf57595ff387 (patch) | |
| tree | 7a541ed87a6a8174d3d94c5f780724a34e08dc1c /sql/session_tracker.cc | |
| parent | dc513dff911d72eaaf9f752f390fef8d1ef9a4b0 (diff) | |
| parent | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (diff) | |
| download | mariadb-git-9216114ce729733e6b0c4ce952bfdf57595ff387.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/session_tracker.cc')
| -rw-r--r-- | sql/session_tracker.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/session_tracker.cc b/sql/session_tracker.cc index c37cdb46fc9..91b529f72d5 100644 --- a/sql/session_tracker.cc +++ b/sql/session_tracker.cc @@ -189,7 +189,13 @@ bool sysvartrack_validate_value(THD *thd, const char *str, size_t len) char *token, *lasts= NULL; size_t rest= var_list.length; - if (!var_list.str || var_list.length == 0 || + if (!var_list.str) + { + my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), + "session_track_system_variables", "NULL"); + return false; + } + if (var_list.length == 0 || !strcmp(var_list.str, "*")) { return false; |