diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-17 22:16:54 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-17 22:16:54 +0300 |
| commit | 2ba49bee0e97ab9571a8bf965b18a7946822b7fb (patch) | |
| tree | ff7694d43f6a555d626904a5e76d66755c22f43d /include | |
| parent | 134fc397f81bc63508e644c12b815fba46b3d79a (diff) | |
| parent | e6f0b154378fc52cdc8c3cf50581e8976abcde13 (diff) | |
| download | mariadb-git-2ba49bee0e97ab9571a8bf965b18a7946822b7fb.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- storage/myisam/mi_packrec.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/myisam.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 81ad947c6b6..255958e08b0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -901,7 +901,7 @@ typedef SOCKET_SIZE_TYPE size_socket; #define FLT_MAX ((float)3.40282346638528860e+38) #endif #ifndef SIZE_T_MAX -#define SIZE_T_MAX ~((size_t) 0) +#define SIZE_T_MAX (~((size_t) 0)) #endif #ifndef isfinite diff --git a/include/myisam.h b/include/myisam.h index 194f0dd806a..e9d1e4ab43e 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 */ |