5 files changed, 64 insertions, 0 deletions
diff --git a/src/common/packets/packets2019_len_main.h b/src/common/packets/packets2019_len_main.h
index 8c46258f8..9e333ff87 100644
--- a/src/common/packets/packets2019_len_main.h
+++ b/src/common/packets/packets2019_len_main.h
@@ -4294,7 +4294,11 @@ packetLen(0x0af8, 11)
 packetLen(0x0af9, 6)
 
 // Packet: 0x0afa
+#if PACKETVER >= 20191204
+packetLen(0x0afa, 58)
+#elif PACKETVER >= 20190109
 packetLen(0x0afa, 54)
+#endif
 
 // Packet: 0x0afb
 packetLen(0x0afb, -1)
@@ -4846,5 +4850,20 @@ packetLen(0x0b66, 25)
 packetLen(0x0b67, 32)
 #endif
 
+// Packet: 0x0b68
+#if PACKETVER >= 20191120
+packetLen(0x0b68, 12)
+#endif
+
+// Packet: 0x0b69
+#if PACKETVER >= 20191127
+packetLen(0x0b69, 18)
+#endif
+
+// Packet: 0x0b6a
+#if PACKETVER >= 20191204
+packetLen(0x0b6a, -1)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_MAIN_H */
diff --git a/src/common/packets/packets2019_len_re.h b/src/common/packets/packets2019_len_re.h
index 489fec550..0f487af37 100644
--- a/src/common/packets/packets2019_len_re.h
+++ b/src/common/packets/packets2019_len_re.h
@@ -4300,7 +4300,11 @@ packetLen(0x0af8, 11)
 packetLen(0x0af9, 6)
 
 // Packet: 0x0afa
+#if PACKETVER >= 20191204
+packetLen(0x0afa, 58)
+#elif PACKETVER >= 20190109
 packetLen(0x0afa, 54)
+#endif
 
 // Packet: 0x0afb
 packetLen(0x0afb, -1)
@@ -4858,5 +4862,20 @@ packetLen(0x0b66, 25)
 packetLen(0x0b67, 32)
 #endif
 
+// Packet: 0x0b68
+#if PACKETVER >= 20191120
+packetLen(0x0b68, 12)
+#endif
+
+// Packet: 0x0b69
+#if PACKETVER >= 20191127
+packetLen(0x0b69, 18)
+#endif
+
+// Packet: 0x0b6a
+#if PACKETVER >= 20191204
+packetLen(0x0b6a, -1)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_RE_H */
diff --git a/src/common/packets/packets2019_len_zero.h b/src/common/packets/packets2019_len_zero.h
index ab3403eb6..da0bf6976 100644
--- a/src/common/packets/packets2019_len_zero.h
+++ b/src/common/packets/packets2019_len_zero.h
@@ -4294,7 +4294,11 @@ packetLen(0x0af8, 11)
 packetLen(0x0af9, 6)
 
 // Packet: 0x0afa
+#if PACKETVER >= 20191204
+packetLen(0x0afa, 58)
+#elif PACKETVER >= 20190116
 packetLen(0x0afa, 54)
+#endif
 
 // Packet: 0x0afb
 packetLen(0x0afb, -1)
@@ -4830,5 +4834,20 @@ packetLen(0x0b66, 25)
 packetLen(0x0b67, 32)
 #endif
 
+// Packet: 0x0b68
+#if PACKETVER >= 20191127
+packetLen(0x0b68, 12)
+#endif
+
+// Packet: 0x0b69
+#if PACKETVER >= 20191127
+packetLen(0x0b69, 18)
+#endif
+
+// Packet: 0x0b6a
+#if PACKETVER >= 20191204
+packetLen(0x0b6a, -1)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_ZERO_H */
diff --git a/src/common/packetsstatic_len.h b/src/common/packetsstatic_len.h
index 730516c27..f721ab882 100644
--- a/src/common/packetsstatic_len.h
+++ b/src/common/packetsstatic_len.h
@@ -32,6 +32,10 @@
 #define DEFINE_PACKET_ID(name, id) \
 	enum { HEADER_##name = id };
 
+#define CHECK_PACKET_HEADER(name, id) \
+	STATIC_ASSERT((int32)(PACKET_LEN_##id) == -1 || sizeof(struct PACKET_##name) == \
+		(size_t)PACKET_LEN_##id, "Wrong size PACKET_"#name); \
+
 #define packetLen(id, len) PACKET_LEN_##id = (len),
 enum packet_lengths {
 #include "common/packets_len.h"
diff --git a/src/common/sql.c b/src/common/sql.c
index 0b5b7fa07..0efc54564 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -94,6 +94,9 @@ static struct Sql *Sql_Malloc(void)
 	{
 		my_bool reconnect = 1;
 		mysql_options(&self->handle, MYSQL_OPT_RECONNECT, &reconnect);
+#ifdef WIN32
+		mysql_optionsv(&self->handle, MYSQL_PLUGIN_DIR, MARIADB_PLUGINDIR);
+#endif
 	}
 	return self;
 }