diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 23:28:35 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 23:28:35 +0300 |
| commit | cd14c47c99ddcc52d7b72832c4d8dad8852e0985 (patch) | |
| tree | bf91e085339760c6e972b1091e9a0c12545e1bc2 /sql/sql_show.cc | |
| parent | 16b603a8b0c2bba16cb66b1769f21c0185435d33 (diff) | |
| parent | b30c1886dc52153009c2ea67878a9763448f461e (diff) | |
| download | mariadb-git-cd14c47c99ddcc52d7b72832c4d8dad8852e0985.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 518712a8db0..038b70c661a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1787,10 +1787,10 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) thd_info->query=0; /* Lock THD mutex that protects its data when looking at it. */ pthread_mutex_lock(&tmp->LOCK_thd_data); - if (tmp->query) + if (tmp->query()) { - uint length= min(max_query_length, tmp->query_length); - thd_info->query=(char*) thd->strmake(tmp->query,length); + uint length= min(max_query_length, tmp->query_length()); + thd_info->query= (char*) thd->strmake(tmp->query(),length); } pthread_mutex_unlock(&tmp->LOCK_thd_data); thread_infos.append(thd_info); @@ -1915,11 +1915,11 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond) pthread_mutex_unlock(&mysys_var->mutex); /* INFO */ - if (tmp->query) + if (tmp->query()) { - table->field[7]->store(tmp->query, + table->field[7]->store(tmp->query(), min(PROCESS_LIST_INFO_WIDTH, - tmp->query_length), cs); + tmp->query_length()), cs); table->field[7]->set_notnull(); } |