diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2022-02-22 10:35:16 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2022-02-22 10:35:16 +0300 |
| commit | a112a80b4762dbb80b25ae0e8bcd93893eacec5f (patch) | |
| tree | 35fb71f2806fc9907b3901124f49d7d39582b3b8 /include | |
| parent | b69191bbb2278fce92b470e8e3abafe048166e39 (diff) | |
| parent | f6f055a19145dc2dbd9efde26dbdd9fe1c60e28f (diff) | |
| download | mariadb-git-a112a80b4762dbb80b25ae0e8bcd93893eacec5f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/plugin.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 738ffc6c53f..e1cc53564ab 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -233,6 +233,7 @@ typedef int (*mysql_show_var_func)(MYSQL_THD, struct st_mysql_show_var*, void *, #define PLUGIN_VAR_NOCMDARG 0x1000 /* No argument for cmd line */ #define PLUGIN_VAR_RQCMDARG 0x0000 /* Argument required for cmd line */ #define PLUGIN_VAR_OPCMDARG 0x2000 /* Argument optional for cmd line */ +#define PLUGIN_VAR_DEPRECATED 0x4000 /* Server variable is deprecated */ #define PLUGIN_VAR_MEMALLOC 0x8000 /* String needs memory allocated */ struct st_mysql_sys_var; @@ -286,7 +287,8 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, #define PLUGIN_VAR_MASK \ (PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR | \ PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_NOCMDARG | \ - PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC) + PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_RQCMDARG | \ + PLUGIN_VAR_DEPRECATED | PLUGIN_VAR_MEMALLOC) #define MYSQL_PLUGIN_VAR_HEADER \ int flags; \ |