3429 Sergey Vojtovich 2010-12-14 [merge]
Merge WL#5571 to trunk-bugfixing.
modified:
include/mysql/plugin_audit.h
include/mysql/plugin_audit.h.pp
sql/mysqld.cc
sql/sql_audit.cc
sql/sql_audit.h
sql/sql_connect.cc
sql/sql_parse.cc
3428 Alexander Barkov 2010-12-14
WL#4616 UTF16-LE
added:
@ mysql-test/include/ctype_heap.inc
@ mysql-test/r/ctype_utf16le.result
@ mysql-test/t/ctype_utf16le.test
Adding rests
modified:
@ cmake/character_sets.cmake
Adding utf16le into the list of the possible default character sets
and into the list of complex character sets.
@ include/m_ctype.h
Adding prototype for global variables
@ mysql-test/r/ctype_utf16.result
Conversion from binary to utf16 did not work well.
Warning did not work well.
Recording new results
@ mysql-test/r/ctype_utf32.result
Warning did not work well.
Recording new results
@ mysys/charset-def.c
Adding initialization for utf16le collations
@ sql/item.cc
Warning did not work well for non-ASCII based character sets.
Adding ErrConvString.
@ sql/item_func.cc
Error message about bad truncated number in CAST(string AS SIGNED)
did not work well (a missing part of "WL#751 Error message construction").
@ sql/sql_string.cc
Conversion from binary to utf16 and utf16le did not work well.
0x61 was incorrectly extended to 0x00000061 instead of 0x0061.
@ sql/sys_vars.cc
"SET collation_connection=utf16_general_ci" followed by
"SET NAMES 'latin1'" did not work well,
because get_charset_by_csname('latin1') was called with utf16 representation
of 'latin1' string. Fixing val_str() to val_str_ascii() to always call
get_charset_by_csname() with 8-bit representation.
Fixing the similar problem for get_charset_by_name().
@ strings/ctype-ucs2.c
- Changing my_strtoll10_mb2 from accessing memory directly using
s[0] and s[1] to mb_wc() method, to reuse the same code for utf16le.
- Adding useful macro for surrogate high/low first/last values.
- Adding macros MY_UTF16_WC2 and MY_UTF16_WC4, to make some utf16
routines more readable.
- Fixing my_caseup_utf16, my_hash_sort_utf16, my_ismbchar_utf16,
my_strnncoll_utf16_bin, my_hash_sort_utf16_bin to use cs->cset->mb_wc
instead of dirrect call to my_utf16_uni, to reuse the code.
- Fixing my_hash_sort_utf16 and my_hash_sort_utf16_bin to use lengthsp()
instead of direct memory access to reuse the code for utf16le.
- Adding low level utf16le functions my_utf16le_uni, my_uni_utf16le,
my_lengthsp_utf16le. These are the only three new functions.
All other functions reuse utf16/ucs2 code.
- Adding utf16le structures.
added:
mysql-test/include/ctype_heap.inc
mysql-test/r/ctype_utf16le.result
mysql-test/t/ctype_utf16le.test
modified:
cmake/character_sets.cmake
include/m_ctype.h
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf32.result
mysys/charset-def.c
sql/item.cc
sql/item_func.cc
sql/sql_string.cc
sql/sys_vars.cc
strings/ctype-ucs2.c
=== modified file 'include/mysql/plugin_audit.h'
--- a/include/mysql/plugin_audit.h 2010-04-15 09:05:17 +0000
+++ b/include/mysql/plugin_audit.h 2010-12-14 14:34:23 +0000
@@ -42,6 +42,8 @@ struct mysql_event
LOG events occurs before emitting to the general query log.
ERROR events occur before transmitting errors to the user.
RESULT events occur after transmitting a resultset to the user.
+ STATUS events occur after transmitting a resultset or errors
+ to the user.
*/
#define MYSQL_AUDIT_GENERAL_CLASS 0
@@ -49,6 +51,7 @@ struct mysql_event
#define MYSQL_AUDIT_GENERAL_LOG 0
#define MYSQL_AUDIT_GENERAL_ERROR 1
#define MYSQL_AUDIT_GENERAL_RESULT 2
+#define MYSQL_AUDIT_GENERAL_STATUS 3
struct mysql_event_general
{
@@ -68,6 +71,43 @@ struct mysql_event_general
};
+/*
+ AUDIT CLASS : CONNECTION
+
+ CONNECT occurs after authentication phase is completed.
+ DISCONNECT occurs after connection is terminated.
+ CHANGE_USER occurs after COM_CHANGE_USER RPC is completed.
+*/
+
+#define MYSQL_AUDIT_CONNECTION_CLASS 1
+#define MYSQL_AUDIT_CONNECTION_CLASSMASK (1 << MYSQL_AUDIT_CONNECTION_CLASS)
+#define MYSQL_AUDIT_CONNECTION_CONNECT 0
+#define MYSQL_AUDIT_CONNECTION_DISCONNECT 1
+#define MYSQL_AUDIT_CONNECTION_CHANGE_USER 2
+
+struct mysql_event_connection
+{
+ unsigned int event_class;
+ unsigned int event_subclass;
+ int status;
+ unsigned long thread_id;
+ const char *user;
+ unsigned int user_length;
+ const char *priv_user;
+ unsigned int priv_user_length;
+ const char *external_user;
+ unsigned int external_user_length;
+ const char *proxy_user;
+ unsigned int proxy_user_length;
+ const char *host;
+ unsigned int host_length;
+ const char *ip;
+ unsigned int ip_length;
+ const char *database;
+ unsigned int database_length;
+};
+
+
/*************************************************************************
Here we define the descriptor structure, that is referred from
st_mysql_plugin.
=== modified file 'include/mysql/plugin_audit.h.pp'
--- a/include/mysql/plugin_audit.h.pp 2010-08-30 14:07:40 +0000
+++ b/include/mysql/plugin_audit.h.pp 2010-12-14 14:34:23 +0000
@@ -208,6 +208,27 @@ struct mysql_event_general
unsigned long long general_time;
unsigned long long general_rows;
};
+struct mysql_event_connection
+{
+ unsigned int event_class;
+ unsigned int event_subclass;
+ int status;
+ unsigned long thread_id;
+ const char *user;
+ unsigned int user_length;
+ const char *priv_user;
+ unsigned int priv_user_length;
+ const char *external_user;
+ unsigned int external_user_length;
+ const char *proxy_user;
+ unsigned int proxy_user_length;
+ const char *host;
+ unsigned int host_length;
+ const char *ip;
+ unsigned int ip_length;
+ const char *database;
+ unsigned int database_length;
+};
struct st_mysql_audit
{
int interface_version;
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2010-12-07 18:11:49 +0000
+++ b/sql/mysqld.cc 2010-12-14 14:38:42 +0000
@@ -1993,6 +1993,7 @@ void close_connection(THD *thd, uint err
{
sleep(0); /* Workaround to avoid tailcall optimisation */
}
+ MYSQL_AUDIT_NOTIFY_CONNECTION_DISCONNECT(thd, errcode);
DBUG_VOID_RETURN;
}
#endif /* EMBEDDED_LIBRARY */
=== modified file 'sql/sql_audit.cc'
--- a/sql/sql_audit.cc 2010-11-05 22:14:29 +0000
+++ b/sql/sql_audit.cc 2010-12-14 14:38:42 +0000
@@ -81,9 +81,34 @@ static void general_class_handler(THD *t
}
+static void connection_class_handler(THD *thd, uint event_subclass, va_list ap)
+{
+ mysql_event_connection event;
+ event.event_class= MYSQL_AUDIT_CONNECTION_CLASS;
+ event.event_subclass= event_subclass;
+ event.status= va_arg(ap, int);
+ event.thread_id= va_arg(ap, unsigned long);
+ event.user= va_arg(ap, const char *);
+ event.user_length= va_arg(ap, unsigned int);
+ event.priv_user= va_arg(ap, const char *);
+ event.priv_user_length= va_arg(ap, unsigned int);
+ event.external_user= va_arg(ap, const char *);
+ event.external_user_length= va_arg(ap, unsigned int);
+ event.proxy_user= va_arg(ap, const char *);
+ event.proxy_user_length= va_arg(ap, unsigned int);
+ event.host= va_arg(ap, const char *);
+ event.host_length= va_arg(ap, unsigned int);
+ event.ip= va_arg(ap, const char *);
+ event.ip_length= va_arg(ap, unsigned int);
+ event.database= va_arg(ap, const char *);
+ event.database_length= va_arg(ap, unsigned int);
+ event_class_dispatch(thd, (const mysql_event *) &event);
+}
+
+
static audit_handler_t audit_handlers[] =
{
- general_class_handler
+ general_class_handler, connection_class_handler
};
static const uint audit_handlers_count=
=== modified file 'sql/sql_audit.h'
--- a/sql/sql_audit.h 2010-11-18 14:39:28 +0000
+++ b/sql/sql_audit.h 2010-12-14 14:38:42 +0000
@@ -32,8 +32,12 @@ extern void mysql_audit_free_thd(THD *th
extern void mysql_audit_acquire_plugins(THD *thd, uint event_class);
+#ifndef EMBEDDED_LIBRARY
extern void mysql_audit_notify(THD *thd, uint event_class,
uint event_subtype, ...);
+#else
+#define mysql_audit_notify(...)
+#endif
extern void mysql_audit_release(THD *thd);
#define MAX_USER_HOST_SIZE 512
@@ -84,6 +88,7 @@ void mysql_audit_general_log(THD *thd, t
event_subtype should be set to one of:
MYSQL_AUDIT_GENERAL_ERROR
MYSQL_AUDIT_GENERAL_RESULT
+ MYSQL_AUDIT_GENERAL_STATUS
@param[in] thd
@param[in] event_subtype Type of general audit event.
@@ -126,5 +131,41 @@ void mysql_audit_general(THD *thd, uint
#endif
}
+#define MYSQL_AUDIT_NOTIFY_CONNECTION_CONNECT(thd) mysql_audit_notify(\
+ (thd), MYSQL_AUDIT_CONNECTION_CLASS, MYSQL_AUDIT_CONNECTION_CONNECT,\
+ (thd)->stmt_da->is_error() ? (thd)->stmt_da->sql_errno() : 0,\
+ (thd)->thread_id, (thd)->security_ctx->user,\
+ (thd)->security_ctx->user ? strlen((thd)->security_ctx->user) : 0,\
+ (thd)->security_ctx->priv_user, strlen((thd)->security_ctx->priv_user),\
+ (thd)->security_ctx->external_user,\
+ (thd)->security_ctx->external_user ?\
+ strlen((thd)->security_ctx->external_user) : 0,\
+ (thd)->security_ctx->proxy_user, strlen((thd)->security_ctx->proxy_user),\
+ (thd)->security_ctx->host,\
+ (thd)->security_ctx->host ? strlen((thd)->security_ctx->host) : 0,\
+ (thd)->security_ctx->ip,\
+ (thd)->security_ctx->ip ? strlen((thd)->security_ctx->ip) : 0,\
+ (thd)->db, (thd)->db ? strlen((thd)->db) : 0)
+
+#define MYSQL_AUDIT_NOTIFY_CONNECTION_DISCONNECT(thd, errcode)\
+ mysql_audit_notify(\
+ (thd), MYSQL_AUDIT_CONNECTION_CLASS, MYSQL_AUDIT_CONNECTION_DISCONNECT,\
+ (errcode), (thd)->thread_id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+
+#define MYSQL_AUDIT_NOTIFY_CONNECTION_CHANGE_USER(thd) mysql_audit_notify(\
+ (thd), MYSQL_AUDIT_CONNECTION_CLASS, MYSQL_AUDIT_CONNECTION_CHANGE_USER,\
+ (thd)->stmt_da->is_error() ? (thd)->stmt_da->sql_errno() : 0,\
+ (thd)->thread_id, (thd)->security_ctx->user,\
+ (thd)->security_ctx->user ? strlen((thd)->security_ctx->user) : 0,\
+ (thd)->security_ctx->priv_user, strlen((thd)->security_ctx->priv_user),\
+ (thd)->security_ctx->external_user,\
+ (thd)->security_ctx->external_user ?\
+ strlen((thd)->security_ctx->external_user) : 0,\
+ (thd)->security_ctx->proxy_user, strlen((thd)->security_ctx->proxy_user),\
+ (thd)->security_ctx->host,\
+ (thd)->security_ctx->host ? strlen((thd)->security_ctx->host) : 0,\
+ (thd)->security_ctx->ip,\
+ (thd)->security_ctx->ip ? strlen((thd)->security_ctx->ip) : 0,\
+ (thd)->db, (thd)->db ? strlen((thd)->db) : 0)
#endif /* SQL_AUDIT_INCLUDED */
=== modified file 'sql/sql_connect.cc'
--- a/sql/sql_connect.cc 2010-11-25 04:41:58 +0000
+++ b/sql/sql_connect.cc 2010-12-14 14:38:42 +0000
@@ -728,9 +728,12 @@ void do_handle_one_connection(THD *thd_a
for (;;)
{
NET *net= &thd->net;
+ bool rc;
lex_start(thd);
- if (login_connection(thd))
+ rc= login_connection(thd);
+ MYSQL_AUDIT_NOTIFY_CONNECTION_CONNECT(thd);
+ if (rc)
goto end_thread;
MYSQL_CONNECTION_START(thd->thread_id, thd->security_ctx->priv_user,
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc 2010-12-14 11:15:13 +0000
+++ b/sql/sql_parse.cc 2010-12-14 14:38:42 +0000
@@ -980,6 +980,7 @@ bool dispatch_command(enum enum_server_c
#endif
case COM_CHANGE_USER:
{
+ bool rc;
status_var_increment(thd->status_var.com_other);
thd->change_user();
@@ -999,7 +1000,9 @@ bool dispatch_command(enum enum_server_c
CHARSET_INFO *save_character_set_results=
thd->variables.character_set_results;
- if (acl_authenticate(thd, 0, packet_length))
+ rc= acl_authenticate(thd, 0, packet_length);
+ MYSQL_AUDIT_NOTIFY_CONNECTION_CHANGE_USER(thd);
+ if (rc)
{
my_free(thd->security_ctx->user);
*thd->security_ctx= save_security_ctx;
@@ -1438,6 +1441,10 @@ bool dispatch_command(enum enum_server_c
if (!thd->is_error() && !thd->killed_errno())
mysql_audit_general(thd, MYSQL_AUDIT_GENERAL_RESULT, 0, 0);
+ mysql_audit_general(thd, MYSQL_AUDIT_GENERAL_STATUS,
+ thd->stmt_da->is_error() ? thd->stmt_da->sql_errno() : 0,
+ command_name[command].str);
+
log_slow_statement(thd);
thd_proc_info(thd, "cleaning up");
Attachment: [text/bzr-bundle] bzr/sergey.vojtovich@oracle.com-20101214143842-g8ok0ubzzdvkgqlz.bundle
| Thread |
|---|
| • bzr push into mysql-trunk-bugfixing branch (sergey.vojtovich:3428 to 3429)WL#5571 | Sergey Vojtovich | 14 Dec |
