summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVlad Lesin <vlad_lesin@mail.ru>2022-02-21 14:10:27 +0300
committerVlad Lesin <vlad_lesin@mail.ru>2022-02-21 14:10:27 +0300
commitf6f055a19145dc2dbd9efde26dbdd9fe1c60e28f (patch)
tree4cc4c241ce0aa7a6d23ea34ebb515cb6b53478fb /include
parentfa557986acaf8d55bbf03fd0ed076f95ef794d1c (diff)
parenta6f258e47f425a3ebecf6aaba87bdfcc241dc416 (diff)
downloadmariadb-git-f6f055a19145dc2dbd9efde26dbdd9fe1c60e28f.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'include')
-rw-r--r--include/mysql/plugin.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 484287db98d..0f9f130cb8e 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -229,6 +229,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;
@@ -282,7 +283,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; \