diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /sql/sql_audit.h | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'sql/sql_audit.h')
| -rw-r--r-- | sql/sql_audit.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_audit.h b/sql/sql_audit.h index 22fdd221e62..1c7d6a1c224 100644 --- a/sql/sql_audit.h +++ b/sql/sql_audit.h @@ -134,7 +134,7 @@ void mysql_audit_general(THD *thd, uint event_subtype, query= thd->query_string; user= user_buff; userlen= make_user_name(thd, user_buff); - rows= thd->warning_info->current_row_for_warning(); + rows= thd->get_stmt_da()->current_row_for_warning(); } else { @@ -155,9 +155,10 @@ void mysql_audit_notify_connection_connect(THD *thd) if (mysql_audit_connection_enabled()) { const Security_context *sctx= thd->security_ctx; + Diagnostics_area *da= thd->get_stmt_da(); mysql_audit_notify(thd, MYSQL_AUDIT_CONNECTION_CLASS, MYSQL_AUDIT_CONNECTION_CONNECT, - thd->stmt_da->is_error() ? thd->stmt_da->sql_errno() : 0, + da->is_error() ? da->sql_errno() : 0, thd->thread_id, sctx->user, sctx->user ? strlen(sctx->user) : 0, sctx->priv_user, strlen(sctx->priv_user), @@ -188,9 +189,10 @@ void mysql_audit_notify_connection_change_user(THD *thd) if (mysql_audit_connection_enabled()) { const Security_context *sctx= thd->security_ctx; + Diagnostics_area *da= thd->get_stmt_da(); mysql_audit_notify(thd, MYSQL_AUDIT_CONNECTION_CLASS, MYSQL_AUDIT_CONNECTION_CHANGE_USER, - thd->stmt_da->is_error() ? thd->stmt_da->sql_errno() : 0, + da->is_error() ? da->sql_errno() : 0, thd->thread_id, sctx->user, sctx->user ? strlen(sctx->user) : 0, sctx->priv_user, strlen(sctx->priv_user), |