Manual merge from mysql-trunk.

Conflicts:
  - storage/myisam/mi_static.c
This commit is contained in:
Alexander Nozdrin 2009-12-24 10:12:07 +03:00
commit 10eab6ccb0

View file

@ -41,7 +41,6 @@ my_off_t myisam_max_temp_length= MAX_FILE_SIZE;
ulong myisam_bulk_insert_tree_size=8192*1024;
ulong myisam_data_pointer_size=4;
ulonglong myisam_mmap_size= SIZE_T_MAX, myisam_mmap_used= 0;
mysql_mutex_t THR_LOCK_myisam_mmap;
static int always_valid(const char *filename __attribute__((unused)))
{