From: magnus.blaudd
Date: June 22 2011 7:38am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4476)
List-Archive: http://lists.mysql.com/commits/139644
Message-Id: <20110622073900.9556D134016@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4769655883122586824=="

--===============4769655883122586824==
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

 4476 magnus.blaudd@stripped	2011-06-22
      nbd
       - use mysql_ prefixed functions when working with mutexes and conds
        declared by MySQL Server
       - move the lock of LOCK_global_server_variables into the accessor
         function and fix mysql_ prefix

    modified:
      sql/ha_ndb_index_stat.cc
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-06-22 07:20:42 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-06-22 07:37:51 +0000
@@ -1585,20 +1585,20 @@ ndb_index_stat_thread_func(void *arg __a
   /*
     wait for mysql server to start
   */
-  pthread_mutex_lock(&LOCK_server_started);
+  mysql_mutex_lock(&LOCK_server_started);
   while (!mysqld_server_started)
   {
     set_timespec(abstime, 1);
-    pthread_cond_timedwait(&COND_server_started, &LOCK_server_started,
-	                       &abstime);
+    mysql_cond_timedwait(&COND_server_started, &LOCK_server_started,
+	                 &abstime);
     if (ndbcluster_terminating)
     {
-      pthread_mutex_unlock(&LOCK_server_started);
+      mysql_mutex_unlock(&LOCK_server_started);
       pthread_mutex_lock(&LOCK_ndb_index_stat_thread);
       goto ndb_index_stat_thread_end;
     }
   }
-  pthread_mutex_unlock(&LOCK_server_started);
+  mysql_mutex_unlock(&LOCK_server_started);
 
   /*
     Wait for cluster to start
@@ -1650,10 +1650,8 @@ ndb_index_stat_thread_func(void *arg __a
       goto ndb_index_stat_thread_end;
     pthread_mutex_unlock(&LOCK_ndb_index_stat_thread);
 
-    pthread_mutex_lock(&LOCK_global_system_variables);
     /* const bool enable_ok_new= THDVAR(NULL, index_stat_enable); */
     const bool enable_ok_new= ndb_index_stat_get_enable(NULL);
-    pthread_mutex_unlock(&LOCK_global_system_variables);
 
     Ndb_index_stat_proc pr;
     pr.ndb= thd_ndb->ndb;

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-06-22 07:12:01 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-22 07:37:51 +0000
@@ -265,7 +265,10 @@ static MYSQL_THDVAR_UINT(
 */
 bool ndb_index_stat_get_enable(THD *thd)
 {
-  return THDVAR(thd, index_stat_enable);
+  mysql_mutex_lock(&LOCK_global_system_variables);
+  const bool value = THDVAR(thd, index_stat_enable);
+  mysql_mutex_unlock(&LOCK_global_system_variables);
+  return value;
 }
 
 /*


--===============4769655883122586824==
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\
#   hvfb7u7uoohje1ng
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: ec1ccadb15c157f0d582163b8c4740fa0ffb5232
# timestamp: 2011-06-22 09:39:00 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   95cc9asxfuf69q1i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcEHzasAAmjfgFAyUWf//35P
vQC////wUAVsrygC93Ww0HdlDhJSaT0jTJGmPU09RpqDRkANDQaaGjTIOaMmJgAmIwI0wIMRgmTA
IwShBGkmmyJ6ag9QPUA0AAGQGhoEilNT0xT0TxQyYmagAaaD1MQAAASSCaGQJppMIYk2SJmoA9Qa
ADNSsRy8D8UEMNV7QPfhjb9V9dmNrGR6GqOmjHbSrSxAbZBsG2oxZ88Hu1BBixUZUK52NY8TEKqi
KqfGYS7PCcU2FpWlXuZyzVPcRKqozTlE0Fy5tHZkfbVVrlhAb4k9pRXdl+cTZAgS44jURxJcjrGv
fmyRYscGVFJCQqyQBrBDIJh5LbEHZcFtamJlZIGgqDOglxYVhcWAatLuPieF5bvqxEuVjDGoS1G6
6cB9IgFjYLgQHAEBtNd50IBiiuSSqgJPIHQskElKt307B5yuFJUoeM94Dn3dVlCIkhrpkRGdinfT
dehRD5Cot70l900MwIDCuKzs07ZGu9ryRxLjKMzSB/wRA9cFpi+Ybjso5JVvDghbNSFXbu1wKMar
zZQdGs0u0Ki3FEyRVtYlYOImNU9jmLx8LYPvOFDiXFxjndpiB44QMJ/MmdhXAcZ5QmOay4tBhi8c
DgdLIf35jjDYrcB5uPAuJF+AFV1DjaYwqzHPLKx+JpxRwkX2liowPMw2DzNXV3VSa4trHVG4ZCiY
mwvKuNYZXUGGrwDKyAmVLZHyMrssLC81aIiWE+TBZSB9BACFsQI2mpry4xxCxbzmVAbQLo4s623P
bswWQ5PHSsY9XmFuPYQsrYmUIG4mdwPLzXcQmL5fHkg0sBfYKL9BXRecRqWKiLJkjBwKyvSREdt2
Bea61h3YiYdD4yAV9xAS/ZY202/X6S8ffY7d9pbbcgmV9KVbds8XH7xq/tVq+0i6ExHwORkF3+lg
LY2B6IrB5wcn+hWLqdKHQrDxMfbAyKh1gup0Mvm/wVVjBnuiU9uDUXhL1uKznJyEkxPC0lInIuBN
BNvUEum+WCKVDOoK7YbRpEtYMlOm1DoBZxVXK6uBzKgmK4I5ekcd8cxOteJcFvJiWr98y0qrcMl4
bFpxddoSCINWffSpG4SjI0HvFrEvSZhnEM01uvVZq7Rs+PfBAbrM/UD46Gh8ajYX9ShjQ9jOvKI0
78+RTx90Zopw4+3UxmWHDDLRsJuGoY87FvTA0FqZ7RYaeyIT6FdnvsmFZJgYg0jSOrAdJmKbxmKg
oPabAKubLpLNbT5HgdS5m20OcDryO0HPIAdBNzWI8SyO3vOIvL9GP1Iqnn9hyAiBoBUGngjKOSG5
hV4rMTg1+5Ek6b3fxwyjLWhvcc0btOt6kd/cBwAhEyRsWm3yPM3hRFHBAC9UqEvAZwk4HKMM+vvW
7DuZikiavQupR5Q3I5nNMONaytGt3xeY7CFxhnmSRhQen4qfq3pRwMgryeWMUmQjQIwMPfGxYo1h
MBOWydSNNhEJQVFdRgQSUSoL6SrEx5udcBukd3zEqI5Xr3PVMOI1YXGG1hg+oipaFuMCRL3hM8ig
joWE9vawJyQaPgMlOfi5ZiJSZJco1dKcxejuSolkaVZBZbRMyYSmJqooqJxMrXG1DEgtr8jyaR8A
JlzWIHlFpcLEIjTvsevMYcZhEQ3JDkZTFsD2W+bz3k+y22/A8TCCGCLBPPwMDgBuuEsiKVyiBPVM
SykuQup2wLFnJZJfADJDjxMq1mRQM2AWDkt9a9d5iBIccj5U3/F3JFOFCQwQfNqw


--===============4769655883122586824==--