diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-14 23:06:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-14 23:06:54 +0200 |
| commit | 50ffaf6d0f8b1ef4e8f4604d6526d3f758e9657b (patch) | |
| tree | 17145568117a90277934b5c0c5dd8ac6df742dd1 /include | |
| parent | e246077bcf5fc22a381ee8591a441eb345a4a2af (diff) | |
| download | mariadb-git-50ffaf6d0f8b1ef4e8f4604d6526d3f758e9657b.tar.gz | |
provide maria* aliases for aria* command-line options,
status and system variables
Diffstat (limited to 'include')
| -rw-r--r-- | include/maria.h | 11 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/maria.h b/include/maria.h index 106aa61ddbb..0e406d747be 100644 --- a/include/maria.h +++ b/include/maria.h @@ -21,12 +21,9 @@ #ifdef __cplusplus extern "C" { #endif -#ifndef _my_base_h #include <my_base.h> -#endif -#ifndef _m_ctype_h +#include <my_sys.h> #include <m_ctype.h> -#endif #include "../storage/maria/ma_pagecache.h" #include "my_handler.h" #include "ft_global.h" @@ -334,6 +331,12 @@ extern int maria_begin(MARIA_HA *info); extern void maria_disable_logging(MARIA_HA *info); extern void maria_enable_logging(MARIA_HA *info); +#define HA_RECOVER_NONE 0 /* No automatic recover */ +#define HA_RECOVER_DEFAULT 1 /* Automatic recover active */ +#define HA_RECOVER_BACKUP 2 /* Make a backupfile on recover */ +#define HA_RECOVER_FORCE 4 /* Recover even if we loose rows */ +#define HA_RECOVER_QUICK 8 /* Don't check rows in data file */ + /* this is used to pass to mysql_mariachk_table */ #define MARIA_CHK_REPAIR 1 /* equivalent to mariachk -r */ diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index ad3427a3ab5..8490d59643b 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; \ - const type def_val; \ + 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; \ - const type def_val; \ + type def_val; \ DECLARE_THDVAR_FUNC(type); \ } MYSQL_SYSVAR_NAME(name) |