diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-04-24 09:54:12 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-04-24 09:54:12 +0400 |
| commit | 79ecd75afd1d6f0adc5bb6c840b9d3c66f014239 (patch) | |
| tree | 71cc3b35dd38106f22c78577ba5fcd63bb92776b /sql/session_tracker.cc | |
| parent | 530396cef0fff2a67faf42f9683bdc5ccb893217 (diff) | |
| parent | 5a759d31f766087d5e135e1d3d3d987693bc9b88 (diff) | |
| download | mariadb-git-79ecd75afd1d6f0adc5bb6c840b9d3c66f014239.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/session_tracker.cc')
| -rw-r--r-- | sql/session_tracker.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/session_tracker.cc b/sql/session_tracker.cc index 03d4b150434..61680fb17f6 100644 --- a/sql/session_tracker.cc +++ b/sql/session_tracker.cc @@ -396,7 +396,7 @@ bool Session_sysvars_tracker::vars_list::parse_var_list(THD *thd, return false; } - if(!strcmp(var_list.str,(const char *)"*")) + if(!strcmp(var_list.str, "*")) { track_all= true; buffer_length= 2; @@ -418,7 +418,7 @@ bool Session_sysvars_tracker::vars_list::parse_var_list(THD *thd, for (;;) { sys_var *svar; - LEX_STRING var; + LEX_CSTRING var; uint not_used; lasts= (char *) memchr(token, separator, rest); @@ -435,7 +435,7 @@ bool Session_sysvars_tracker::vars_list::parse_var_list(THD *thd, /* Remove leading/trailing whitespace. */ trim_whitespace(char_set, &var, ¬_used); - if(!strcmp(var.str,(const char *)"*")) + if(!strcmp(var.str, "*")) { track_all= true; } @@ -483,7 +483,7 @@ bool Session_sysvars_tracker::check_var_list(THD *thd, size_t rest= var_list.length; if (!var_list.str || var_list.length == 0 || - !strcmp(var_list.str,(const char *)"*")) + !strcmp(var_list.str, "*")) { return false; } @@ -500,7 +500,7 @@ bool Session_sysvars_tracker::check_var_list(THD *thd, mysql_mutex_lock(&LOCK_plugin); for (;;) { - LEX_STRING var; + LEX_CSTRING var; uint not_used; lasts= (char *) memchr(token, separator, rest); @@ -517,7 +517,7 @@ bool Session_sysvars_tracker::check_var_list(THD *thd, /* Remove leading/trailing whitespace. */ trim_whitespace(char_set, &var, ¬_used); - if(!strcmp(var.str,(const char *)"*") && + if(!strcmp(var.str, "*") && !find_sys_var_ex(thd, var.str, var.length, throw_error, true)) { if (throw_error && take_mutex && thd) |