Added support for:

MariaDB 64 bit 10.11.8, 10.11.9, 10.11.10, 11.2.3, 11.2.4, 11.2.5, 11.2.6, 11.4.3, 11.4.4, 11.7.1

config/ac_mysql.m4

@@ -21,7 +21,7 @@ AC_DEFUN([MYSQL_SRC_TEST], [
   [
     withval=`dir_resolve "$withval"`
 	ac_mysql_source_dir="$withval"
-    HEADERS="include/my_dir.h include/mysql/plugin.h include/mysql.h include/mysql_version.h include/config.h include/my_config.h"
+    HEADERS="include/my_dir.h include/mysql/plugin.h include/mysql.h include/mysql_version.h include/my_config.h"
     for file in $HEADERS; do
       if ! test -r "$withval/$file"; then
          AC_MSG_ERROR([Failed to find required header file $file in $withval, check the path and make sure you've run './configure ..<options>.. && cd include && make' in MySQL 5.1 sources dir or 'cmake . && make' in MySQL 5.5 sources dir.])

include/audit_handler.h

@@ -448,7 +448,7 @@ static inline const CHARSET_INFO * pfs_connect_attrs_cs(const void * pfs)
 	}
 
 	if (   ( major == 5  && ( (minor == 6 && patch >= 15) || minor >= 7) ) || (major == 8)	// MySQL
-	    || ( major == 10 && ( (minor == 0 && patch >= 11) || minor >= 1) ) )	// MariaDB
+	    || ( major == 10 && ( (minor == 0 && patch >= 11) || minor >= 1) ) || (major >= 11) ) // MariaDB
 	{
 		uint cs_number = *(uint *) (((unsigned char *) pfs) + Audit_formatter::thd_offsets.pfs_connect_attrs_cs);
 		if (!cs_number)

include/mysql_inc.h

@@ -5,6 +5,11 @@
 #define HAVE_CONFIG_H
 #endif
 
+// Compatibility shim for older zlib versions
+#if !defined(ZLIB_VERNUM) || ZLIB_VERNUM < 0x1290
+#define crc32_z(crc, buf, len) crc32((crc), (buf), (len))
+#endif
+
 #define MYSQL_DYNAMIC_PLUGIN 1
 #define MYSQL_SERVER 1
 

offset-extract/offset-extract.sh

@@ -75,7 +75,7 @@ else
 	CONNECT_ATTRS='printf ", 0, 0, 0"'
 fi
 
-if echo $MYVER | grep -P '^(5\.7|8\.0)' > /dev/null
+if echo $MYVER | grep -P '^(5\.7|8\.4|8\.0)' > /dev/null
 then
 	if echo $MYVER | grep -P '^5\.7\.8' > /dev/null
 	then
@@ -115,7 +115,7 @@ DA_STATUS="print_offset Diagnostics_area m_status"		# 5.5, 5.6, 5.7, mariadb 10.
 DA_SQL_ERRNO="print_offset Diagnostics_area m_sql_errno"	# 5.5, 5.6, mariadb 10.0 to 10.5
 STMT_DA="print_offset THD m_stmt_da"				# 5.6, 5.7, mariadb 10.0 to 10.5
 
-if echo $MYVER | grep -P '^(5\.7|8\.0)' > /dev/null
+if echo $MYVER | grep -P '^(5\.7|8\.4|8\.0)' > /dev/null
 then
 	DA_SQL_ERRNO="print_offset Diagnostics_area m_mysql_errno"
 elif echo $MYVER | grep -P '^(5\.6|10\.)' > /dev/null
@@ -132,7 +132,7 @@ fi
 
 LEX_COMMENT=""
 VIEW_TABLES=""
-if echo $MYVER | grep -P '^(8\.0)' > /dev/null
+if echo $MYVER | grep -P '^(8\.4|8\.0)' > /dev/null
 then
 	LEX_COMMENT='printf ", 0"'
 	# TABLE_LIST struct was used in older versions of mysql, its replacement is Table_ref class

src/audit_offsets.cc

@@ -81,12 +81,22 @@ const ThdOffsets thd_offsets_arr[] =
 const ThdOffsets thd_offsets_arr[] =
 {
 	/* +++ MYSQL 64 OFFSETS GO HERE +++ */
-	//offsets for: mysqld (8.0.37-commercial)
-	{"8.0.37-commercial","ad11041390174d8d5445686ef2183816", 9456, 9496, 4960, 6396, 1288, 0, 0, 32, 64, 160, 1376, 9596, 6016, 4248, 4256, 4260, 7680, 1576, 32, 8640, 8680, 8664, 12840, 140, 668, 320},
+	    //offsets for: mysqld (8.4.5-commercial)
+        {"8.4.5-commercial","dddd1b6411ef3412a692288d057a010b", 9512, 9552, 5024, 6452, 1280, 0, 0, 32, 64, 160, 1368, 9652, 6072, 4328, 4336, 4340, 7736, 1592, 32, 8696, 8736, 8720, 13032, 140, 668, 344},
+        //offsets for: mysqld (8.4.4)
+        {"8.4.4","3561a47b597886dd313e01c38c15b71f", 9512, 9552, 5024, 6452, 1280, 0, 0, 32, 64, 160, 1368, 9652, 6072, 4328, 4336, 4340, 7736, 1592, 32, 8696, 8736, 8720, 13032, 140, 668, 344},
+	    //offsets for: mysqld (8.0.41)
+        {"8.0.41","e818c531909ed2f1bf78b7c125da947c", 9440, 9480, 4952, 6380, 1280, 0, 0, 32, 64, 160, 1368, 9580, 6000, 4248, 4256, 4260, 7664, 1576, 32, 8624, 8664, 8648, 12824, 140, 668, 320},
+		//offsets for: /usr/sbin/mysqld (8.0.40-commercial)
+        {"8.0.40-commercial","f5276b320d427d6fe806890834484722", 9440, 9480, 4952, 6380, 1280, 0, 0, 32, 64, 160, 1368, 9580, 6000, 4248, 4256, 4260, 7664, 1576, 32, 8624, 8664, 8648, 12824, 140, 668, 320},
+        //offsets for: mysqld (8.0.39-commercial)
+        {"8.0.39-commercial","67adafe314eabdfd8e559d82afd39680", 9440, 9480, 4952, 6380, 1280, 0, 0, 32, 64, 160, 1368, 9580, 6000, 4248, 4256, 4260, 7664, 1576, 32, 8624, 8664, 8648, 12824, 140, 668, 320},
+        //offsets for: mysqld (8.0.37-commercial)
+        {"8.0.37-commercial","ad11041390174d8d5445686ef2183816", 9456, 9496, 4960, 6396, 1288, 0, 0, 32, 64, 160, 1376, 9596, 6016, 4248, 4256, 4260, 7680, 1576, 32, 8640, 8680, 8664, 12840, 140, 668, 320},
         //offsets for: /usr/sbin/mysqld (8.0.36)
         {"8.0.36","9ba2568aeceed956bc047f4913f8285a", 9448, 9488, 4952, 6388, 1288, 0, 0, 32, 64, 160, 1376, 9588, 6008, 4248, 4256, 4260, 7672, 1576, 32, 8632, 8672, 8656, 12832, 140, 668, 320},
-         //offsets for: /usr/sbin/mysqld (8.0.35)
-         {"8.0.35","465a40519e83cab54735ba515ba596bc", 9496, 9536, 4952, 6436, 1288, 0, 0, 32, 64, 160, 1376, 9636, 6056, 4248, 4256, 4260, 7720, 1576, 32, 8680, 8720, 8704, 12880, 140, 664, 320},
+        //offsets for: /usr/sbin/mysqld (8.0.35)
+        {"8.0.35","465a40519e83cab54735ba515ba596bc", 9496, 9536, 4952, 6436, 1288, 0, 0, 32, 64, 160, 1376, 9636, 6056, 4248, 4256, 4260, 7720, 1576, 32, 8680, 8720, 8704, 12880, 140, 664, 320},
 	//offsets for: /usr/sbin/mysqld (8.0.34)
 	{"8.0.34","2bf7588f074ff87a28dcc5fdc781d6e4", 9496, 9536, 4952, 6436, 1288, 0, 0, 32, 64, 160, 1376, 9636, 6056, 4248, 4256, 4260, 7720, 1576, 32, 8680, 8720, 8704, 12880, 140, 664, 320},
 	//offsets for: /usr/sbin/mysqld (8.0.33)
@@ -470,6 +480,34 @@ const ThdOffsets thd_offsets_arr[] =
 const ThdOffsets thd_offsets_arr[] =
 {
 	/* +++ MARIADB 64 OFFSETS GO HERE +++ */
+	//offsets for: mariadbd (11.7.1-MariaDB)
+	{"11.7.1-MariaDB","60f1d2837407f25d97b76cdc6045a07f", 16248, 16432, 8240, 10456, 88, 3696, 8, 0, 16, 24, 160, 16564, 10040, 5720, 5728, 5732, 696, 0, 0, 15488, 15512, 15496, 25384, 564, 8, 0},
+	//offsets for: /usr/sbin/mariadbd (11.5.2-MariaDB)
+    {"11.5.2-MariaDB","f25184aea1490c0c91f77dc71c6fdfd6", 16208, 16392, 8200, 10416, 88, 3672, 8, 0, 16, 24, 160, 16524, 10000, 5712, 5720, 5724, 696, 0, 0, 15448, 15472, 15456, 25312, 564, 8, 0}, 
+	//offsets for: mariadbd (11.4.4-MariaDB)
+	{"11.4.4-MariaDB","b5a5b69803f3ed1916fc1fea55ae11a3", 16128, 16304, 8120, 10336, 88, 3672, 8, 0, 16, 24, 160, 16436, 9920, 5704, 5712, 5716, 696, 0, 0, 15368, 15392, 15376, 25224, 564, 8, 0},
+	//offsets for: mariadbd (11.4.3-MariaDB)
+	{"11.4.3-MariaDB","0b8a3603e293dea4d41337d37dcd0f27", 16120, 16296, 8112, 10328, 88, 3672, 8, 0, 16, 24, 160, 16428, 9912, 5704, 5712, 5716, 696, 0, 0, 15360, 15384, 15368, 25216, 564, 8, 0},
+	//offsets for: /usr/sbin/mariadbd (11.4.2-MariaDB)
+	{"11.4.2-MariaDB","9fb9133fd7e2f68d76150ebc17b69812", 16104, 16280, 8104, 10312, 88, 3672, 8, 0, 16, 24, 160, 16412, 9896, 5704, 5712, 5716, 696, 0, 0, 15344, 15368, 15352, 25200, 564, 8, 0},  
+	//offsets for: /usr/sbin/mariadbd (11.3.2-MariaDB)
+	{"11.3.2-MariaDB","cfe74e02e490d5ce0e8aea46c921a1be", 16104, 16280, 8104, 10312, 88, 3672, 8, 0, 16, 24, 160, 16412, 9896, 5704, 5712, 5716, 696, 0, 0, 15344, 15368, 15352, 25192, 564, 8, 0},
+    //offsets for: mariadbd (11.2.6-MariaDB)
+	{"11.2.6-MariaDB","5ac51c45f404e0a98ae17163f0f08888", 16112, 16288, 8120, 10336, 88, 3672, 8, 0, 16, 24, 160, 16420, 9920, 5704, 5712, 5716, 696, 0, 0, 15368, 15392, 15376, 25408, 564, 8, 0},
+	//offsets for: mariadbd (11.2.5-MariaDB)
+	{"11.2.5-MariaDB","d524bc1054ae2bc4041cc76aea3a739e", 16104, 16280, 8112, 10328, 88, 3672, 8, 0, 16, 24, 160, 16412, 9912, 5704, 5712, 5716, 696, 0, 0, 15360, 15384, 15368, 25400, 564, 8, 0},
+	//offsets for: mariadbd (11.2.4-MariaDB)
+	{"11.2.4-MariaDB","0c37910f7f53481610d741d5d4acef39", 16088, 16264, 8104, 10312, 88, 3672, 8, 0, 16, 24, 160, 16396, 9896, 5704, 5712, 5716, 696, 0, 0, 15344, 15368, 15352, 25384, 564, 8, 0},
+	//offsets for: mariadbd (11.2.3-MariaDB)
+	{"11.2.3-MariaDB","3e407fcdc210e505675933c7754f1687", 16088, 16264, 8104, 10312, 88, 3672, 8, 0, 16, 24, 160, 16396, 9896, 5704, 5712, 5716, 696, 0, 0, 15344, 15368, 15352, 25376, 564, 8, 0},
+	//offsets for: /usr/sbin/mariadbd (11.2.2-MariaDB)
+	{"11.2.2-MariaDB","e92cae4589408753743ece17bbdae5fb", 16080, 16256, 8096, 10304, 88, 0, 8, 0, 16, 24, 160, 16388, 9888, 5704, 5712, 5716, 696, 0, 0, 15336, 15360, 15344, 0, 0, 0, 440},
+    //offsets for: mariadbd (10.11.10-MariaDB)
+    {"10.11.10-MariaDB","75853cbb027bfd91b2bda935a71154d1", 15960, 16136, 7968, 10184, 88, 3664, 8, 0, 16, 24, 160, 16268, 9768, 5688, 5696, 5700, 696, 0, 0, 15216, 15240, 15224, 25200, 564, 8, 0},
+    //offsets for: mariadbd (10.11.9-MariaDB)
+    {"10.11.9-MariaDB","d8632d45fa4fcdefeb69f0edac20b21d", 15952, 16128, 7960, 10176, 88, 3656, 8, 0, 16, 24, 160, 16260, 9760, 5688, 5696, 5700, 696, 0, 0, 15208, 15232, 15216, 25184, 564, 8, 0},
+    //offsets for: mariadbd (10.11.8-MariaDB)
+    {"10.11.8-MariaDB","7d3f2e890b92eeba51bde77ee5e6d4f5", 15936, 16112, 7952, 10160, 88, 3656, 8, 0, 16, 24, 160, 16244, 9744, 5688, 5696, 5700, 696, 0, 0, 15192, 15216, 15200, 25168, 564, 8, 0},
 	//offsets for: mariadbd (10.11.7-MariaDB)
 	{"10.11.7-MariaDB","d84a65522e255859aa02332b1464e20c", 15936, 16112, 7952, 10160, 88, 3656, 8, 0, 16, 24, 160, 16244, 9744, 5688, 5696, 5700, 696, 0, 0, 15192, 15216, 15200, 25160, 564, 8, 0},
 	//offsets for: mariadbd (10.11.6-MariaDB)
@@ -1975,4 +2013,4 @@ const ThdOffsets thd_offsets_arr[] =
 #endif // end 32bit offsets
 
 //the size of the offsets arr
-const size_t thd_offsets_arr_size = array_elements(thd_offsets_arr);
+const size_t thd_offsets_arr_size = array_elements(thd_offsets_arr);