diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
| commit | e642701c325e7b557d1a16d98f110581c26c2f28 (patch) | |
| tree | 6fc830df498046ca29b2381fb809726faeb04f52 /sql/sql_audit.cc | |
| parent | a0f8951963443db308d072dbc0794bb93d2fcf45 (diff) | |
| parent | b6dcd0ecbee17787297e882ed63cf4e13d981943 (diff) | |
| download | mariadb-git-e642701c325e7b557d1a16d98f110581c26c2f28.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
Diffstat (limited to 'sql/sql_audit.cc')
| -rw-r--r-- | sql/sql_audit.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc index 39ab33abfe6..7d269d455a9 100644 --- a/sql/sql_audit.cc +++ b/sql/sql_audit.cc @@ -65,6 +65,7 @@ static void general_class_handler(THD *thd, uint event_subtype, va_list ap) { mysql_event_general event; event.event_class= MYSQL_AUDIT_GENERAL_CLASS; + event.event_subclass= event_subtype; event.general_error_code= va_arg(ap, int); event.general_thread_id= thd ? thd->thread_id : 0; event.general_time= va_arg(ap, time_t); |