bzr push into mysql-trunk branch (Georgi.Kodinov:3364 to 3365)

[Georgi Kodinov]

 3365 Georgi Kodinov	2011-08-12 [merge]
      merged to mysql-trunk

    modified:
      sql/sql_class.cc
 3364 Georgi Kodinov	2011-08-12 [merge]
      null merge of the version bump to trunk

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2011-08-11 08:47:53 +0000
+++ b/sql/sql_class.cc	2011-08-12 13:57:06 +0000
@@ -680,8 +680,8 @@ char *thd_security_context(THD *thd, cha
   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);
 

No bundle (reason: useless for push emails).