diff options
| author | unknown <monty@mysql.com> | 2005-10-12 00:59:52 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-10-12 00:59:52 +0300 |
| commit | 562163e4848a5a85e8c34e8f2aa0bf3f65848277 (patch) | |
| tree | 7613691c50c9b918d5dbcb5683e2672e06db2a71 /sql/sql_show.cc | |
| parent | 122b48fd4d4f45f4b24758b7be2d11c8cc162017 (diff) | |
| parent | d6ccd7c7b62b6e0998e2fa28b76d5e2908f74f8e (diff) | |
| download | mariadb-git-562163e4848a5a85e8c34e8f2aa0bf3f65848277.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_manager.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 807b72595db..e53b7c24833 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1263,9 +1263,6 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) VOID(pthread_mutex_unlock(&LOCK_thread_count)); thread_info *thd_info; -#ifndef NO_EMBEDDED_ACCESS_CHECKS - Security_context *sctx; -#endif time_t now= time(0); while ((thd_info=thread_infos.get())) { |