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 | c8555bdb35d998e99b6fb568f03c63479ff9272d (patch) | |
| tree | 3b69ab5126c40ef71ad69a5bb469de82c4be90a0 /storage | |
| parent | 962d77de368e0cc90431e24d09e884f3760c7939 (diff) | |
| parent | 3d915225611a921fad03934e58bf281b48fc15b0 (diff) | |
| download | mariadb-git-c8555bdb35d998e99b6fb568f03c63479ff9272d.tar.gz | |
Merge next-mr -> next-4284
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 20433122da0..77b94947ba6 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1709,7 +1709,7 @@ int ha_myisam::info(uint flag) /* Update share */ if (share->tmp_table == NO_TMP_TABLE) - pthread_mutex_lock(&share->LOCK_ha_data); + mysql_mutex_lock(&share->LOCK_ha_data); share->keys_in_use.set_prefix(share->keys); share->keys_in_use.intersect_extended(misam_info.key_map); share->keys_for_keyread.intersect(share->keys_in_use); @@ -1719,7 +1719,7 @@ int ha_myisam::info(uint flag) (char*) misam_info.rec_per_key, sizeof(table->key_info[0].rec_per_key[0])*share->key_parts); if (share->tmp_table == NO_TMP_TABLE) - pthread_mutex_unlock(&share->LOCK_ha_data); + mysql_mutex_unlock(&share->LOCK_ha_data); /* Set data_file_name and index_file_name to point at the symlink value |