diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 16:43:03 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 16:43:03 +0300 |
| commit | b92ab41c5c380448422bd776c73fddfd5c7507f6 (patch) | |
| tree | 3b69ab5126c40ef71ad69a5bb469de82c4be90a0 /sql/ha_partition.h | |
| parent | dfc15e2acc9312c3357b6149feb771c724ba8252 (diff) | |
| parent | a4c3bc618bb83884a19dc157bc56d4e3d2432c22 (diff) | |
| download | mariadb-git-b92ab41c5c380448422bd776c73fddfd5c7507f6.tar.gz | |
Merge next-mr -> next-4284
Diffstat (limited to 'sql/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index fc0e98348db..843c1d6892e 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -36,7 +36,7 @@ typedef struct st_partition_share { char *table_name; uint table_name_length, use_count; - pthread_mutex_t mutex; + mysql_mutex_t mutex; THR_LOCK lock; } PARTITION_SHARE; #endif @@ -933,7 +933,7 @@ private: if(table_share->tmp_table == NO_TMP_TABLE) { auto_increment_lock= TRUE; - pthread_mutex_lock(&table_share->LOCK_ha_data); + mysql_mutex_lock(&table_share->LOCK_ha_data); } } virtual void unlock_auto_increment() @@ -946,7 +946,7 @@ private: */ if(auto_increment_lock && !auto_increment_safe_stmt_log_lock) { - pthread_mutex_unlock(&table_share->LOCK_ha_data); + mysql_mutex_unlock(&table_share->LOCK_ha_data); auto_increment_lock= FALSE; } } |