diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-08-15 18:34:42 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-08-15 18:34:42 +0400 |
| commit | dca971de92e1faa4ea5ff6efc79923de60a6ab86 (patch) | |
| tree | efc93b888dc9a779dddeff2d2358b22bf9b7cf1a /sql/sql_class.cc | |
| parent | 4af1e1545f649e0ace51f397e3ee751ebde55669 (diff) | |
| download | mariadb-git-dca971de92e1faa4ea5ff6efc79923de60a6ab86.tar.gz | |
Cherry-picking patch for 12777649 from mysql-5.5
to mysql-5.5.16-release.
Original revision:
# revision-id: georgi.kodinov@oracle.com-20110812135004-3z3yjy7krf374clu
# parent: georgi.kodinov@oracle.com-20110812112536-dmh9i67tm8pqvz1a
# committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
# branch nick: B12777649-5.5
# timestamp: Fri 2011-08-12 16:50:04 +0300
# message:
# Bug #12777649: "OS THREAD ID" REMOVED
#
# Pushed Calvin's patch.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 97a227c8bb5..0b1de2c47fa 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -655,8 +655,8 @@ char *thd_security_context(THD *thd, char *buffer, unsigned int length, const char *proc_info= thd->proc_info; len= my_snprintf(header, sizeof(header), - "MySQL thread id %lu, query id %lu", - thd->thread_id, (ulong) thd->query_id); + "MySQL thread id %lu, OS thread handle 0x%lx, query id %lu", + thd->thread_id, (ulong) thd->real_id, (ulong) thd->query_id); str.length(0); str.append(header, len); |