diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
| commit | e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e (patch) | |
| tree | ca30b82c7f6cd44e80283058f48c8e2d0603e3c5 /storage | |
| parent | 932285774ba4ad10c199953d47fc0f688fd12c10 (diff) | |
| parent | 8c4d4cc3a6f1fd9852e11e16926a5e98cca5ee03 (diff) | |
| download | mariadb-git-e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/mi_static.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mi_static.c b/storage/myisam/mi_static.c index 073b127f1a3..55967fc9001 100644 --- a/storage/myisam/mi_static.c +++ b/storage/myisam/mi_static.c @@ -33,9 +33,9 @@ uint myisam_quick_table_bits=9; ulong myisam_block_size= MI_KEY_BLOCK_LENGTH; /* Best by test */ my_bool myisam_flush=0, myisam_delay_key_write=0, myisam_single_user=0; #if defined(THREAD) && !defined(DONT_USE_RW_LOCKS) -uint myisam_concurrent_insert= 2; +ulong myisam_concurrent_insert= 2; #else -uint myisam_concurrent_insert= 0; +ulong myisam_concurrent_insert= 0; #endif ulonglong myisam_max_temp_length= MAX_FILE_SIZE; ulong myisam_data_pointer_size=4; |