diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-04 20:34:15 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-04 20:34:15 +0300 |
| commit | a9e22b589677df9035c73e61b80be0fc54d175a5 (patch) | |
| tree | bf6e8bd7de75f7f9ec6dbf8903d150ed3511a6da /sql/ha_ndbcluster_binlog.cc | |
| parent | 1edca1d7ef6a77d406ea2c1bcaf5d9aff2f4c04c (diff) | |
| parent | 8dfc3fbbab0dc7b3be98a47423ae74a6b4933864 (diff) | |
| download | mariadb-git-a9e22b589677df9035c73e61b80be0fc54d175a5.tar.gz | |
Merge next-mr -> next-4284-merge.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index a736dc4536f..1e6d6e26697 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -3643,9 +3643,9 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) /* We need to set thd->thread_id before thd->store_globals, or it will set an invalid value for thd->variables.pseudo_thread_id. */ - pthread_mutex_lock(&LOCK_thread_count); + mysql_mutex_lock(&LOCK_thread_count); thd->thread_id= thread_id++; - pthread_mutex_unlock(&LOCK_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); mysql_thread_set_psi_id(thd->thread_id); @@ -3681,9 +3681,9 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) pthread_detach_this_thread(); thd->real_id= pthread_self(); - pthread_mutex_lock(&LOCK_thread_count); + mysql_mutex_lock(&LOCK_thread_count); threads.append(thd); - pthread_mutex_unlock(&LOCK_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); thd->lex->start_transaction_opt= 0; if (!(s_ndb= new Ndb(g_ndb_cluster_connection, "")) || |