diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
| commit | 8d73ec2d1b01ca9d3d5ca55881f10fcd7e5f0015 (patch) | |
| tree | 220c965bb467b020a4db171d7803586f9ed22cea /include/mysql/plugin_auth.h.pp | |
| parent | ce4b468f7e36717298c16e7bafc562c89798e453 (diff) | |
| parent | e2dff1b5bdd860ae931d3ad6eb78225b81b8060a (diff) | |
| download | mariadb-git-8d73ec2d1b01ca9d3d5ca55881f10fcd7e5f0015.tar.gz | |
Merge 5.2->5.3
- Re-commit Monty's merge, partially fixed by Igor and SergeyP,
but still broken
Diffstat (limited to 'include/mysql/plugin_auth.h.pp')
| -rw-r--r-- | include/mysql/plugin_auth.h.pp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index 7db3dbb4715..b0d5daf4c64 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -1,8 +1,6 @@ #include <mysql/plugin.h> #include <mysql/services.h> #include <mysql/service_my_snprintf.h> -#include <stdarg.h> -#include <stdlib.h> extern struct my_snprintf_service_st { size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); @@ -10,7 +8,6 @@ extern struct my_snprintf_service_st { size_t my_snprintf(char* to, size_t n, const char* fmt, ...); size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); #include <mysql/service_thd_alloc.h> -#include <stdlib.h> struct st_mysql_lex_string { char *str; @@ -91,7 +88,7 @@ struct st_maria_plugin struct st_mysql_show_var *status_vars; struct st_mysql_sys_var **system_vars; const char *version_info; - int maturity; + unsigned int maturity; }; enum enum_ftparser_mode { |