diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/plugin_audit.h | 20 | ||||
| -rw-r--r-- | include/mysql/plugin_audit.h.pp | 18 | ||||
| -rw-r--r-- | include/mysql/service_my_print_error.h | 5 |
3 files changed, 16 insertions, 27 deletions
diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h index 10039c4c1fa..7582245945f 100644 --- a/include/mysql/plugin_audit.h +++ b/include/mysql/plugin_audit.h @@ -65,8 +65,7 @@ struct mysql_event_general unsigned long long general_rows; /* Added in version 0x302 */ unsigned long long query_id; - const char *database; - unsigned int database_length; + MYSQL_CONST_LEX_STRING database; }; @@ -101,8 +100,7 @@ struct mysql_event_connection unsigned int host_length; const char *ip; unsigned int ip_length; - const char *database; - unsigned int database_length; + MYSQL_CONST_LEX_STRING database; }; /* @@ -137,17 +135,13 @@ struct mysql_event_table const char *proxy_user; const char *host; const char *ip; - const char *database; - unsigned int database_length; - const char *table; - unsigned int table_length; + MYSQL_CONST_LEX_STRING database; + MYSQL_CONST_LEX_STRING table; + /* for MYSQL_AUDIT_TABLE_RENAME */ + MYSQL_CONST_LEX_STRING new_database; + MYSQL_CONST_LEX_STRING new_table; /* for MYSQL_AUDIT_TABLE_LOCK, true if read-only, false if read/write */ int read_only; - /* for MYSQL_AUDIT_TABLE_RENAME */ - const char *new_database; - unsigned int new_database_length; - const char *new_table; - unsigned int new_table_length; /* Added in version 0x302 */ unsigned long long query_id; }; diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp index de4356af740..89f7dcc36c4 100644 --- a/include/mysql/plugin_audit.h.pp +++ b/include/mysql/plugin_audit.h.pp @@ -543,8 +543,7 @@ struct mysql_event_general unsigned long long general_time; unsigned long long general_rows; unsigned long long query_id; - const char *database; - unsigned int database_length; + MYSQL_CONST_LEX_STRING database; }; struct mysql_event_connection { @@ -563,8 +562,7 @@ struct mysql_event_connection unsigned int host_length; const char *ip; unsigned int ip_length; - const char *database; - unsigned int database_length; + MYSQL_CONST_LEX_STRING database; }; struct mysql_event_table { @@ -577,15 +575,11 @@ struct mysql_event_table const char *proxy_user; const char *host; const char *ip; - const char *database; - unsigned int database_length; - const char *table; - unsigned int table_length; + MYSQL_CONST_LEX_STRING database; + MYSQL_CONST_LEX_STRING table; + MYSQL_CONST_LEX_STRING new_database; + MYSQL_CONST_LEX_STRING new_table; int read_only; - const char *new_database; - unsigned int new_database_length; - const char *new_table; - unsigned int new_table_length; unsigned long long query_id; }; struct st_mysql_audit diff --git a/include/mysql/service_my_print_error.h b/include/mysql/service_my_print_error.h index 636151655e5..5a71be74fd0 100644 --- a/include/mysql/service_my_print_error.h +++ b/include/mysql/service_my_print_error.h @@ -50,11 +50,12 @@ extern struct my_print_error_service_st { #define my_printv_error(A,B,C,D) my_print_error_service->my_printv_error_func(A,B,C,D) #else - +#ifndef MY_ERROR_DEFINED extern void my_error(unsigned int nr, unsigned long MyFlags, ...); extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); -#endif +#endif /* MY_ERROR_DEFINED */ +#endif /* MYSQL_DYNAMIC_PLUGIN */ #ifdef __cplusplus } |