summaryrefslogtreecommitdiff
path: root/include/myisam.h
diff options
context:
space:
mode:
authorSatya B <satya.bn@sun.com>2009-12-17 17:15:13 +0530
committerSatya B <satya.bn@sun.com>2009-12-17 17:15:13 +0530
commitbbf079cf2cdee06b2a96cc520a10f33f28754ad3 (patch)
tree4c93c836980d7cf93eeacca6d20f05143aec86f5 /include/myisam.h
parent4621d480fc476127722e7a14656051edebb3673c (diff)
parentcf9966f86f3c6245f33342f2f5498a0c5efa96e4 (diff)
downloadmariadb-git-bbf079cf2cdee06b2a96cc520a10f33f28754ad3.tar.gz
merge mysql-5.0-bugteam to mysql-5.1-bugteam
Diffstat (limited to 'include/myisam.h')
-rw-r--r--include/myisam.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/myisam.h b/include/myisam.h
index 19b35538c65..5334fd6afc4 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -259,6 +259,8 @@ extern ulong myisam_bulk_insert_tree_size, myisam_data_pointer_size;
/* usually used to check if a symlink points into the mysql data home */
/* 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;
/* Prototypes for myisam-functions */
@@ -304,6 +306,7 @@ extern int mi_delete_all_rows(struct st_myisam_info *info);
extern ulong _mi_calc_blob_length(uint length , const uchar *pos);
extern uint mi_get_pointer_length(ulonglong file_length, uint def);
+#define MEMMAP_EXTRA_MARGIN 7 /* Write this as a suffix for mmap file */
/* this is used to pass to mysql_myisamchk_table */
#define MYISAMCHK_REPAIR 1 /* equivalent to myisamchk -r */