diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
| commit | 99f7f9a907bd0aa2fc43dc2b192b29ec42330ec7 (patch) | |
| tree | 1f14300a8f95891aff71bf267d5b096d3f8b1ff6 /include | |
| parent | 7d0c4cb5c65e4e882ad20e7e317400fa527df9e9 (diff) | |
| parent | 82e2ca0181cdf3682c965ee500dc40472d07b41d (diff) | |
| download | mariadb-git-99f7f9a907bd0aa2fc43dc2b192b29ec42330ec7.tar.gz | |
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/myisam.h | 2 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 1a14314b244..19cf0ed050d 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -327,7 +327,7 @@ DECLARE_MYSQL_SYSVAR_SIMPLE(name, unsigned long long) = { \ #name, comment, check, update, &varname, def, min, max, blk } #define MYSQL_SYSVAR_ENUM(name, varname, opt, comment, check, update, def, typelib) \ -DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned int) = { \ +DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned long) = { \ PLUGIN_VAR_ENUM | ((opt) & PLUGIN_VAR_MASK), \ #name, comment, check, update, &varname, def, typelib } |