diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-25 12:57:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-25 12:57:36 +0300 |
| commit | 19ceaf2928bbd562e3fd5eabecd8ca69fdf062b6 (patch) | |
| tree | 88c378a716b01193fedcbac207908a34e465f3c8 /sql/sql_show.cc | |
| parent | 7457181ba43870ca9a619d74b7614b868f0a7511 (diff) | |
| parent | 790a74d22beeadbd75dcc84dca03b3b450acd8bf (diff) | |
| download | mariadb-git-19ceaf2928bbd562e3fd5eabecd8ca69fdf062b6.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 1099821fcb3..4bc9870f422 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2734,8 +2734,12 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) else protocol->store_null(); protocol->store(thd_info->state_info, system_charset_info); - protocol->store(thd_info->query_string.str(), - thd_info->query_string.charset()); + if (thd_info->query_string.length()) + protocol->store(thd_info->query_string.str(), + thd_info->query_string.length(), + thd_info->query_string.charset()); + else + protocol->store_null(); if (!thd->variables.old_mode && !(thd->variables.old_behavior & OLD_MODE_NO_PROGRESS_INFO)) protocol->store(thd_info->progress, 3, &store_buffer); |