github
/
mysql-audit
mirror of https://github.com/mcafee-enterprise/mysql-audit
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Issue #155 - slave shutdown crashes master. 

Add offsets for MariaDB 10.0.30 and 10.1.22.
pull/179/head
Aharon Robbins 2017-03-15 15:21:08 +02:00
parent 570bfb0de6
commit 0ff56ddfb4
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audit_offsets.cc
View File

@ -842,6 +842,10 @@ const ThdOffsets thd_offsets_arr[] =
const ThdOffsets thd_offsets_arr[] =
{
/* +++ MARIADB 64 OFFSETS GO HERE +++ */
//offsets for: /mariadb/10.0.30/bin/mysqld (10.0.30-MariaDB)
{"10.0.30-MariaDB","d66f15d0d8a8573a84d45721c8fcb135", 13480, 13544, 6256, 7864, 88, 2976, 8, 0, 16, 24, 152, 13636, 7632, 3136, 3144, 3148, 560, 0, 0, 12856, 12880, 12864},
//offsets for: /mariadb/10.1.22/bin/mysqld (10.1.22-MariaDB)
{"10.1.22-MariaDB","5a1cc6bbc10e0dc2e7b3b1218ec867c1", 13648, 13712, 6424, 8032, 88, 2976, 8, 0, 16, 24, 152, 13804, 7800, 3136, 3144, 3148, 568, 0, 0, 13024, 13048, 13032},
//offsets for: /mariadb/10.0.10/bin/mysqld (10.0.10-MariaDB)
{"10.0.10-MariaDB","95b0ecd856e2c5012b03ff0ce292cf05", 14368, 14432, 6184, 7784, 88, 2992, 8, 0, 16, 24, 152, 14524, 7552, 2136, 2144, 2152, 568, 0, 0, 12776, 12800, 12784},
//offsets for: /mariadb/10.0.11/bin/mysqld (10.0.11-MariaDB)
@ -1001,6 +1005,10 @@ const ThdOffsets thd_offsets_arr[] =
const ThdOffsets thd_offsets_arr[] =
{
/* +++ MARIADB 32 OFFSETS GO HERE +++ */
//offsets for: /mariadb/10.1.22/bin/mysqld (10.1.22-MariaDB)
{"10.1.22-MariaDB","0302c7fcc222fe61efcf1080f0470caa", 8504, 8540, 3848, 5308, 44, 1896, 4, 0, 8, 12, 84, 8616, 5176, 2604, 2608, 2612, 356, 0, 0, 8028, 8052, 8036},
//offsets for: /mariadb/10.0.30/bin/mysqld (10.0.30-MariaDB)
{"10.0.30-MariaDB","e0d4851453098671900da227c950b3ec", 8368, 8404, 3712, 5172, 44, 1896, 4, 0, 8, 12, 84, 8476, 5040, 2604, 2608, 2612, 352, 0, 0, 7892, 7916, 7900},
//offsets for: /mariadb/5.5.54/bin/mysqld (5.5.54-MariaDB)
{"5.5.54-MariaDB","eafbedd4e3f9f869faaa5106d3fd218e", 7276, 7312, 3460, 4468, 44, 1856, 4, 0, 8, 12, 84, 7372, 4400, 0, 0, 0, 340, 0, 0, 7176, 7200, 7184},
//offsets for: /mariadb/5.5.53/bin/mysqld (5.5.53-MariaDB)

11
src/audit_plugin.cc
View File

@ -723,6 +723,15 @@ static int audit_notify(THD *thd, mysql_event_class_t event_class,
const void * event)
#endif
{
if (thd == NULL) // can happen in replication setup
{
#if ! defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
return 0; // return success, keep MySQL going
#else
return;
#endif
}
if (MYSQL_AUDIT_GENERAL_CLASS == event_class)
{
const struct mysql_event_general *event_general =
@ -2385,7 +2394,7 @@ static MYSQL_SYSVAR_STR(delay_cmds, delay_cmds_string,
static MYSQL_SYSVAR_STR(whitelist_cmds, whitelist_cmds_string,
PLUGIN_VAR_RQCMDARG,
"AUDIT plugin whitelisted commands for which queries are not recorded, comma separated",
NULL, whitelist_cmds_string_update, "BEGIN,COMMIT");
NULL, whitelist_cmds_string_update, "BEGIN,COMMIT,PING");
static MYSQL_SYSVAR_STR(record_cmds, record_cmds_string,
PLUGIN_VAR_RQCMDARG,
"AUDIT plugin commands for which queries are recorded, comma separated. If set then only queries of these commands will be recorded.",