bzr push into mysql-5.5 branch (mikael.ronstrom:3137 to 3138)

[Mikael Ronstrom]

 3138 Mikael Ronstrom	2011-04-20
      Fixed missing change of thd_unlock_connection_data to thd_unlock_thread_count

    modified:
      sql/sql_class.cc
 3137 Mikael Ronström	2011-04-15
      Merge 5.5, step 3

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/buf0rea.h
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/mtr/mtr0mtr.c
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	revid:mikael@dator9-20110415135830-ofi8opbbw3wve9wz
+++ b/sql/sql_class.cc	revid:mikael.ronstrom@stripped9-d0h6tdvqusrd32e8
@@ -359,7 +359,7 @@ void thd_new_connection_setup(THD *thd, 
   thd->prior_thr_create_utime= thd->thr_create_utime= thd->start_utime=
     my_micro_time();
   threads.append(thd);
-  thd_unlock_connection_data(thd);
+  thd_unlock_thread_count(thd);
   DBUG_PRINT("info", ("init new connection. thd: 0x%lx fd: %d",
           (ulong)thd, thd->net.vio->sd));
   thd_set_thread_stack(thd, stack_start);

No bundle (reason: useless for push emails).