diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:02:55 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:02:55 +0000 |
| commit | b4c0c1550cd3aa53851b0344a433d8b7eea67d9c (patch) | |
| tree | 9909bd321761de0c8085748ac06b4a431906e670 /sql/ha_ndbcluster_binlog.cc | |
| parent | 18a8f3c8cc00f8bfa59f982fcf39edb89d941ef0 (diff) | |
| parent | a6165accb3279fe64b672fa0eeaa30ef12cf6557 (diff) | |
| download | mariadb-git-b4c0c1550cd3aa53851b0344a433d8b7eea67d9c.tar.gz | |
merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
Text conflict in sql/sql_insert.cc
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 80215d0bb17..eb46958398a 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -3661,9 +3661,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); @@ -3699,9 +3699,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, "")) || |