diff options
| author | unknown <hf@deer.(none)> | 2004-05-28 15:59:29 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-05-28 15:59:29 +0500 |
| commit | 2c38f5fbc005d743d4c4ccc141edb5428e3d4c57 (patch) | |
| tree | 9ba2527c9a95020c3a8e8492a1fdec59513b2591 /sql/sql_show.cc | |
| parent | dad0008927729c3b79c341aee742784f470fb271 (diff) | |
| download | mariadb-git-2c38f5fbc005d743d4c4ccc141edb5428e3d4c57.tar.gz | |
Proposed fix for bug #3412 (embedded server: prepared statement returns
empty recordset where some records should be found)
sql/ha_myisam.cc:
Code simplified with vio_ok()
sql/mysqld.cc:
vio_ok used
sql/slave.cc:
vio_ok used
sql/sql_class.cc:
Here is the place of the error - we should not examine net.vio in
embedded library
sql/sql_class.h:
method added to always return TRUE in embedded library, and to
sheck thd.net.vio otherwise
sql/sql_show.cc:
code simplified with vio_ok()
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a54a6fa1a4c..6c4b65a4a70 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1540,13 +1540,8 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) while ((tmp=it++)) { struct st_my_thread_var *mysys_var; -#ifndef EMBEDDED_LIBRARY - if ((tmp->net.vio || tmp->system_thread) && - (!user || (tmp->user && !strcmp(tmp->user,user)))) -#else - if (tmp->system_thread && + if ((tmp->vio_ok() || tmp->system_thread) && (!user || (tmp->user && !strcmp(tmp->user,user)))) -#endif { thread_info *thd_info=new thread_info; |