diff --git a/src/audit_offsets.cc b/src/audit_offsets.cc index f23071a..df50e9e 100644 --- a/src/audit_offsets.cc +++ b/src/audit_offsets.cc @@ -831,6 +831,8 @@ const ThdOffsets thd_offsets_arr[] = const ThdOffsets thd_offsets_arr[] = { /* +++ MARIADB 64 OFFSETS GO HERE +++ */ + //offsets for: /mariadb/10.0.26/bin/mysqld (10.0.26-MariaDB) + {"10.0.26-MariaDB","5e48ef1551a2e96cc7b8aeb276776f15", 13432, 13496, 6208, 7816, 88, 2976, 8, 0, 16, 24, 152, 13588}, //offsets for: /mariadb/5.5.50/bin/mysqld (5.5.50-MariaDB) {"5.5.50-MariaDB","219e536c7578133cf8139cc815be678c", 12032, 12096, 5800, 6904, 88, 2920, 8, 0, 16, 24, 152, 12168}, //offsets for: /mariadb/10.1.14/bin/mysqld (10.1.14-MariaDB) @@ -932,6 +934,8 @@ const ThdOffsets thd_offsets_arr[] = const ThdOffsets thd_offsets_arr[] = { /* +++ MARIADB 32 OFFSETS GO HERE +++ */ + //offsets for: /mariadb/10.0.26/bin/mysqld (10.0.26-MariaDB) + {"10.0.26-MariaDB","eb8b020269d3906300ff4f7adef68788", 8344, 8380, 3688, 5148, 44, 1892, 4, 0, 8, 12, 84, 8452}, //offsets for: /mariadb/5.5.50/bin/mysqld (5.5.50-MariaDB) {"5.5.50-MariaDB","c7ae7501b914c06dc7bc020bd6d5a8f3", 7276, 7312, 3460, 4468, 44, 1856, 4, 0, 8, 12, 84, 7372}, //offsets for: /mariadb/10.1.14/bin/mysqld (10.1.14-MariaDB) diff --git a/src/audit_plugin.cc b/src/audit_plugin.cc index c77023d..d5225a4 100644 --- a/src/audit_plugin.cc +++ b/src/audit_plugin.cc @@ -25,6 +25,8 @@ #include "md5.h" #endif + + /* Disable __attribute__() on non-gcc compilers. diff --git a/src/hot_patch.cc b/src/hot_patch.cc index 5e4d7f2..566b253 100644 --- a/src/hot_patch.cc +++ b/src/hot_patch.cc @@ -2,6 +2,17 @@ #include "udis86.h" #include +#include + +// Temporary hack to get htings to build: these two lines should work but don't +#ifndef INT32_MIN +# define INT32_MIN (-2147483647-1) +#endif + +#ifndef INT32_MAM +# define INT32_MAX (2147483647) +#endif + #define UINT unsigned int #define DWORD uint32_t #define BYTE unsigned char