diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-09-27 21:48:10 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-09-27 21:48:10 +0300 |
| commit | 0df1789285e2a824e6d77d58f8cd8d974bbe3773 (patch) | |
| tree | fd23094ff9a897cfb0d26170fa9177f24a82b17b /include | |
| parent | 87d4af831aa037cc862ad285e3a051a97af1ec6f (diff) | |
| download | mariadb-git-0df1789285e2a824e6d77d58f8cd8d974bbe3773.tar.gz | |
Rename control file and log files from maria_xxx to aria_xxx when upgrading from MariaDB 5.1
Fix cleanup to really remove 'aria_log' files. Fixes failures in maria unit tests on some platforms.
Fixed compiler warnings
include/mysql/plugin.h:
Changed def_val back to const, to remove compiler warnings.
storage/maria/ma_init.c:
Rename control file and log files from maria_xxx to aria_xxx when upgrading from MariaDB 5.1
storage/maria/unittest/ma_maria_log_cleanup.c:
Fix cleanup to really remove 'aria_log' files. Fixes failures in maria unit tests on some platforms.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/plugin.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 8490d59643b..77d141d5282 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -257,7 +257,7 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, #define DECLARE_MYSQL_SYSVAR_BASIC(name, type) struct { \ MYSQL_PLUGIN_VAR_HEADER; \ type *value; \ - type def_val; \ + const type def_val; \ } MYSQL_SYSVAR_NAME(name) #define DECLARE_MYSQL_SYSVAR_SIMPLE(name, type) struct { \ @@ -279,7 +279,7 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, #define DECLARE_MYSQL_THDVAR_BASIC(name, type) struct { \ MYSQL_PLUGIN_VAR_HEADER; \ int offset; \ - type def_val; \ + const type def_val; \ DECLARE_THDVAR_FUNC(type); \ } MYSQL_SYSVAR_NAME(name) @@ -294,7 +294,7 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, #define DECLARE_MYSQL_THDVAR_TYPELIB(name, type) struct { \ MYSQL_PLUGIN_VAR_HEADER; \ int offset; \ - type def_val; \ + const type def_val; \ DECLARE_THDVAR_FUNC(type); \ TYPELIB *typelib; \ } MYSQL_SYSVAR_NAME(name) |