bzr push into mysql-5.5 branch (Georgi.Kodinov:3492 to 3493) Bug#12777649

[Georgi Kodinov]

 3493 Georgi Kodinov	2011-08-12
      Bug #12777649: "OS THREAD ID" REMOVED 
      
      Pushed Calvin's patch.

    modified:
      sql/sql_class.cc
 3492 Georgi Kodinov	2011-08-12 [merge]
      merged the version bump. bumped the 5.5 version to 5.5.17

    modified:
      VERSION
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2011-08-02 07:54:35 +0000
+++ b/sql/sql_class.cc	2011-08-12 13:50:04 +0000
@@ -655,8 +655,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).