update ceph source to reef 18.1.2

[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / libodb-mysql / fix-redefinttion.patch

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libodb-mysql/fix-redefinttion.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libodb-mysql/fix-redefinttion.patch
new file mode 100644 (file)
index 0000000..ec6dab4
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libodb-mysql/fix-redefinttion.patch
@@ -0,0 +1,32 @@
+diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx\r
+index 5396791..32a2a03 100644\r
+--- a/odb/mysql/mysql-types.hxx\r
++++ b/odb/mysql/mysql-types.hxx\r
+@@ -7,13 +7,24 @@\r
+ \r
+ #include <odb/mysql/details/config.hxx>\r
+ \r
++#include <odb/mysql/version.hxx>\r
++\r
+ typedef bool my_bool;\r
++\r
++#if !defined(LIBODB_MYSQL_MARIADB) && MYSQL_VERSION_ID >= 80011\r
++struct MYSQL_BIND;\r
++#else\r
+ typedef struct st_mysql_bind MYSQL_BIND;\r
++#endif\r
+ \r
+-#ifdef LIBODB_MYSQL_INCLUDE_SHORT\r
+-#  include <mysql_time.h>\r
++#ifdef LIBODB_MYSQL_MARIADB\r
++#  include <mysql/mysql.h>\r
+ #else\r
+-#  include <mysql/mysql_time.h>\r
++#  ifdef LIBODB_MYSQL_INCLUDE_SHORT\r
++#    include <mysql_time.h>\r
++#  else\r
++#    include <mysql/mysql_time.h>\r
++#  endif\r
+ #endif\r
+ \r
+ #endif // ODB_MYSQL_MYSQL_TYPES_HXX\r