From: magnus.blaudd
Date: June 22 2011 7:13am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4474)
List-Archive: http://lists.mysql.com/commits/139641
Message-Id: <20110622071304.99B18134016@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0865911076995099727=="

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

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4474 magnus.blaudd@stripped	2011-06-22
      ndb
       - use my_hash_ prefixed version when calling my_hash function,
         the non prefixed functions has been removed in the future.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-06-20 12:34:27 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-22 07:12:01 +0000
@@ -11049,7 +11049,7 @@ static int ndbcluster_init(void *p)
   if (pthread_create(&tmp2, &connection_attrib, ndb_index_stat_thread_func, 0))
   {
     DBUG_PRINT("error", ("Could not create ndb index statistics thread"));
-    hash_free(&ndbcluster_open_tables);
+    my_hash_free(&ndbcluster_open_tables);
     pthread_mutex_destroy(&ndbcluster_mutex);
     pthread_mutex_destroy(&LOCK_ndb_index_stat_thread);
     pthread_cond_destroy(&COND_ndb_index_stat_thread);
@@ -11070,7 +11070,7 @@ static int ndbcluster_init(void *p)
   if (!ndb_index_stat_thread_running)
   {
     DBUG_PRINT("error", ("ndb index statistics thread exited prematurely"));
-    hash_free(&ndbcluster_open_tables);
+    my_hash_free(&ndbcluster_open_tables);
     pthread_mutex_destroy(&ndbcluster_mutex);
     pthread_mutex_destroy(&LOCK_ndb_index_stat_thread);
     pthread_cond_destroy(&COND_ndb_index_stat_thread);


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   kz22v87bm25melfk
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 86705c09d21bc22a277fe43e2924730adc33abdc
# timestamp: 2011-06-22 09:13:04 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   8jdqr1f412whqskz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQZp6uoAAZffgEAQUWf//1IA
AAC////wUAOtXd5zTdeNnIBKFFPapm0NU8mGinlMgGjajQANFMUzU8SfpJ6mgNAAAAAShAEmjJhE
MmTSA9T9UGR6agklNJp6jTTRo0AZGgAAAEkpoYTRqNGKno9Rpo9SeU0aAAxPG8XlDiWX2EODEa4w
QLcJoNLF7OrEZFc27t2Kqpp9w9nyUxXi1jPZ/tP7bvjTq+LGjrl92p+FYFx+U3W347pIcuKMqHiV
D+FY+Sc5iHOlL/cdliJHQyuhstdAQ8U1xEL7auy5XxRGqzhxrZEB8ehacx2UEuRRCSAxS5RKByir
lhh2mCeQJGThR0cnpK8YKHp4hhS0BLMHlRIk6bWzqZME1rxbiujNOJY6g6TqK5KE5foBmWXoZRmJ
wiVyCzNyCIrb7uQdBQ3wHne+oOXTIg8wFanDLe7UcXjyJrr4ZEc5/sqsZU04Fxgq0YY4vbg947dh
xvlA2XE7quh3t7epO+O+pXNTxTOXEyhDBHuMrKmo2noKVFEbW8hRaCFg4pjAp4NQtlSAYfByw1t8
oEBSM76ubA1bREKe0HWDRCcC0BGxqVPC34ErKyXBNlD1omWZu11JlXSMNVzo7VjVgZmHjIsVeTCM
l0NDpPE+uKenvzcIQmqKdm6p1Clj0ea7En2Fpmcaw5QKl2z9onlMRK+9wewjaVI2XyRJWYHrOIon
u6D9ddrgvxI26hEpULc/MidU1Eo4ndctTtn3UZhGKLUilhqGFNYUJbZEU9NWshDCUiE+zI/kdxyz
qXpNJUQpo6t/ONmCjui5zb35nBqHhVy09WqrKMpKVNNZjNqfRbrGFEmqk6yQqRUmsTBaVIzOtMnm
0HJqMSbh9DJZimuJOUfuHftICPwlM/gwIHKGpEjCJcNDJmDpMPjDER8OQymCFTYy5ZsJq3gb1UTO
YSy++m6vGDA3Y5h4zLJdFGs0ZN0e7EOJwFJdDMKgnUHmI8piGKhwq/Dg3Zz0dRDxb0/RyFY2JSOY
j7TDCHO6cinA7HeyVFZhGINPaQCm5O5F5vnvOuuOpCSo8QZLr45gnSAmnBobBcBDkEl2qWE7hvFS
N/FmVZasY5V2lsfQkdCGy6rTuYL0wYCXlTEiUginm4+xLT6E1w99LJvLfEZXwrKCIlccrLKWAxG7
u5BVxUlnts0Pa8vRNF+71+Y52RQxqZUY0OrH6hpnebEAmFbLTdqNpIQ5PweIvwRZ6+/eLc9PzCh3
utXP3xIkEQWwaDONhcGHs2Vf/F3JFOFCQBmnq6g=


--===============0865911076995099727==--