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 | 8977575cff0ed295692e866b1cd543bdf49c0a20 (patch) | |
tree | ca30b82c7f6cd44e80283058f48c8e2d0603e3c5 /include | |
parent | b38eada6ae1283ac53897f8878cbfb2f36bd3d0d (diff) | |
parent | 5e638f47550018a89ce52aba501f66c3fb5d302a (diff) | |
download | mariadb-git-8977575cff0ed295692e866b1cd543bdf49c0a20.tar.gz |
Auto-merge from mysql-5.5.
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 3efc65a900a..c4076ead403 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -249,7 +249,7 @@ typedef struct st_columndef /* column information */ extern char * myisam_log_filename; /* Name of logfile */ extern ulong myisam_block_size; -extern uint myisam_concurrent_insert; +extern ulong myisam_concurrent_insert; extern my_bool myisam_flush,myisam_delay_key_write,myisam_single_user; extern my_off_t myisam_max_temp_length; extern ulong myisam_data_pointer_size; |