diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-22 12:12:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-22 12:12:49 +0200 |
| commit | 92f79a22e63a3fef71106c64dfd8559ee9bdda4a (patch) | |
| tree | 5d83cdcf964805192546fd8bfdef999f5444e58d /include/mysql | |
| parent | 120480d15b764d03d5d36fb68735a1975ceb3454 (diff) | |
| parent | a112a80b4762dbb80b25ae0e8bcd93893eacec5f (diff) | |
| download | mariadb-git-92f79a22e63a3fef71106c64dfd8559ee9bdda4a.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include/mysql')
| -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 d3301a36e82..cc0943e4382 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; \ |