diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-12-22 08:29:03 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-12-22 08:29:03 +0300 |
commit | 6cd07928085ac479f3748ba80a598e50c1100f5f (patch) | |
tree | 96fd71d2d227cf003d10a1f5293ce43217a6a8b4 /include | |
parent | ec93c3ed238c591b0167a8d7f08772308f4e7bd5 (diff) | |
parent | 9e4f62f967eb17ced512e9417ec049b169c0620a (diff) | |
download | mariadb-git-6cd07928085ac479f3748ba80a598e50c1100f5f.tar.gz |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'include')
-rw-r--r-- | include/myisam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/myisam.h b/include/myisam.h index e9d1e4ab43e..e6404cb5405 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -260,7 +260,7 @@ extern ulong myisam_bulk_insert_tree_size, myisam_data_pointer_size; /* which is normally forbidden */ extern int (*myisam_test_invalid_symlink)(const char *filename); extern ulonglong myisam_mmap_size, myisam_mmap_used; -extern pthread_mutex_t THR_LOCK_myisam_mmap; +extern mysql_mutex_t THR_LOCK_myisam_mmap; /* Prototypes for myisam-functions */ |