Add patch from facebook/mysql-5.6#1216

Atry · Aug 18, 2022 · 6c27324 · 6c27324
1 parent ac70c95
commit 6c27324
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/third-party/fb-mysql/CMakeLists.txt b/third-party/fb-mysql/CMakeLists.txt
@@ -13,6 +13,9 @@ include(HPHPFunctions)
 ExternalProject_Add(
   bundled_fbmysqlclient
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/
+  PATCH_COMMAND
+  "${CMAKE_CURRENT_SOURCE_DIR}/../apply-quilt-patches.sh"
+  "${CMAKE_CURRENT_SOURCE_DIR}/patches"
   CMAKE_ARGS
   -DWITHOUT_SERVER=TRUE
   -DDISABLE_SHARED=TRUE

diff --git a/third-party/fb-mysql/patches/1216.patch b/third-party/fb-mysql/patches/1216.patch
@@ -0,0 +1,24 @@
+From c750f61ad7d8ba806d09cb3bb8ff134f3a40de96 Mon Sep 17 00:00:00 2001
+From: "Yang, Bo" <pop.atry@gmail.com>
+Date: Wed, 17 Aug 2022 18:53:21 -0700
+Subject: [PATCH] Update plugin_audit.h.pp corresponding to
+ f7c9e2f2d11f09bd003a101f89153bde85ac4da8
+
+---
+ include/mysql/plugin_audit.h.pp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp
+index abb5f86cb11..55362f37e66 100644
+--- a/include/mysql/plugin_audit.h.pp
++++ b/include/mysql/plugin_audit.h.pp
+@@ -349,6 +349,9 @@
+   SQLCOM_PURGE_RAFT_LOG,
+   SQLCOM_PURGE_RAFT_LOG_BEFORE,
+   SQLCOM_SHOW_RAFT_LOGS,
++  SQLCOM_START_SHARDBEATER,
++  SQLCOM_STOP_SHARDBEATER,
++  SQLCOM_SHOW_SHARDBEATER_STAT,
+   SQLCOM_END
+ };
+ #include "plugin_audit_message_types.h"
diff --git a/third-party/fb-mysql/patches/series b/third-party/fb-mysql/patches/series
@@ -0,0 +1 @@
+1216.patch