From: Mikael Ronstrom
Date: April 20 2011 1:07pm
Subject: bzr commit into mysql-5.5 branch (mikael.ronstrom:3138)
List-Archive: http://lists.mysql.com/commits/135805
Message-Id: <201104201308.p3KD8Ogq022597@dator6>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8469394667803918671=="

--===============8469394667803918671==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/mikael/mysql_clones/mysql-5.5-wl5136_community/ based on revid:mikael@dator9-20110415135830-ofi8opbbw3wve9wz

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

    modified:
      sql/sql_class.cc
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	revid:mikael@dator9-20110415135830-ofi8opbbw3wve9wz
+++ b/sql/sql_class.cc	revid:mikael.ronstrom@stripped
@@ -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);


--===============8469394667803918671==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mikael.ronstrom@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mikael.ronstrom@stripped\
#   d0h6tdvqusrd32e8
# target_branch: file:///home/mikael/mysql_clones/mysql-5.5-\
#   wl5136_community/
# testament_sha1: cf9560216280c8d697234408fffeda2178e42eaf
# timestamp: 2011-04-20 15:07:24 +0200
# base_revision_id: mikael@dator9-20110415135830-ofi8opbbw3wve9wz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWV7zYWwAAXBfgAAQUGP//1MC
EAC/7//wUAOV3d7bW68G92Td4SUSaMmm1MTT1Mmmp6aTaBPRNBoGiNU8nomp5Mk0nqbUNAPUaAAE
lNAjUxAA0JppkHqAaAEik0JgTQaI02k0aaMho9IASU0Un6aaJ6U2TQ1HqAANMmgNuWJ8hYSxmR34
QABpg2KMYaS61MzHLUvhHZMEQ1rcce3XH18GnJ5ajvZXi9uumbbqwTWIjfBpiLA1i1jRVZviqtSl
9Oc4SuXqtaVaV1lMbtkorMFDiYdcpMSCGxXjGMap6Q6ZkYV44diUVKts4msUnKcd0TxcPBCVgvCD
gQVNjcLqwQFTzBjAhQp/MagIJ68blBalCN0+WDGFhKQi0U8dEjvqNOkGvKDCzLZvLlFnCmDmG1ie
MwwrVdJ9KVwUeQ/iPMkqZfs/FjHyKYIHS8Z1bpbMCCvxYcInoIVTp5+FtlwEt4uX8kHEKLHrLIA0
zLDmNVUa2CvVeSkV3TT6oDqDnmQumYmMimC3eDq3szFUZtpQtN5h4G47KpcWPGVYOWL2QyK03BAU
y3MDPKztx9JaLFsugWs1Nera6Mn3BBTgnO5jIE+R8+Zstsp46lJn6crwaUaWmYw1Fcy0+dRWXVIw
5PJEk15q4SVBzHEfFUGP7DilBbbQTF0A3zaYHOzonTyhjAvl3FFs8auqtZlPdbgrUZA2uo2+/FcM
2Fm67a3BelAlGlRAEqtp5ipv3ieWOqJ1mTIFpJFL9hBYQ0cBcPDAOOpjskwsVkwfbnY3PEDt7zVi
Xj4f6iW+ZnjlFKByn7s1eWkIUD0xdpXX2FtthEGVNhpHHN3WI6wnGc0Esi/MOsdTToNI0SYXPPYT
dgM2BQytNZtNK0FnLknPsP3uSNZQpTTvC3N+dmeMVO9wTLv2HrijMFtjrB5Qy2/Y5IrD0m8CCmqn
JOM8vvkVXakuClpqOp9Dn7HBfp3UNFJGKXMfZNFc3hdCBJvuCPSqAEl42p2msDLNB20aFJcWxUl6
TSZQjhD+iB6p1BikwsXCCzQMhuLtyy621OojwxK7TVSdUduJDcxX7VaksJC+SKK+WUzlfOitzQIo
OqUse8jUFym59kXE4bwaSw6dHVfDMbBZ1ZR1gZQHQY3s3yNTkJ8Kazx3sryMsOq07HkdAWhYuccw
ETVOZH33OUhHeK455TstCqCQWVQFfReFNmU6rkteHGdA//F3JFOFCQXvNhbA


--===============8469394667803918671==--