(#4532) (#4530) Include the mysqld_error.h header in mariadb-connector-c

conan-io · Feb 13, 2021 · 3a84410 · 3a84410
1 parent 1b7d466
commit 3a84410
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/recipes/mariadb-connector-c/all/conandata.yml b/recipes/mariadb-connector-c/all/conandata.yml
@@ -10,3 +10,5 @@ patches:
       base_path: "source_subfolder"
     - patch_file: "patches/0003-include-order-windows-winsock2.patch"
       base_path: "source_subfolder"
+    - patch_file: "patches/0004-include-mysqld_error-header.patch"
+      base_path: "source_subfolder"
diff --git a/recipes/mariadb-connector-c/all/patches/0004-include-mysqld_error-header.patch b/recipes/mariadb-connector-c/all/patches/0004-include-mysqld_error-header.patch
@@ -0,0 +1,11 @@
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -10,7 +10,7 @@ SET(MARIADB_CLIENT_INCLUDES ${CC_SOURCE_DIR}/include/mariadb_com.h
+                             ${CC_SOURCE_DIR}/include/mariadb_ctype.h
+                             ${CC_SOURCE_DIR}/include/mariadb_rpl.h
+                             )
+-IF(NOT IS_SUBPROJECT)
++IF(TRUE)
+   SET(MARIADB_CLIENT_INCLUDES ${MARIADB_CLIENT_INCLUDES}
+                               ${CC_SOURCE_DIR}/include/mysqld_error.h
+                               )
diff --git a/recipes/mariadb-connector-c/all/test_package/test_package.c b/recipes/mariadb-connector-c/all/test_package/test_package.c
@@ -1,6 +1,9 @@
 #include <mysql.h>
 #include <stdio.h>
 
+// See #4530
+#include <mysqld_error.h>
+
 int main(int argc, char **argv)
 {
   printf("MySQL client version: %s\n", mysql_get_client_info());