RepositoryExternal.mk | 7
download.lst | 4
external/mariadb-connector-c/README | 18
external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 113
+----
external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 26 -
external/mariadb-connector-c/clang-cl.patch.0 | 4
external/mariadb-connector-c/configs/linux_my_config.h | 212
+--------
external/mariadb-connector-c/configs/mac_my_config.h | 217
+---------
external/mariadb-connector-c/configs/mariadb_version.h | 38 +
external/mariadb-connector-c/configs/mysql_version.h | 28 -
external/mariadb-connector-c/configs/wnt_ma_config.h | 154
+++++++
external/mariadb-connector-c/mariadb-CONC-104.patch.1 | 49 --
external/mariadb-connector-c/mariadb-inline.patch.1 | 23 -
external/mariadb-connector-c/mariadb-msvc.patch.1 | 13
external/mariadb-connector-c/mariadb-swap.patch | 24 -
solenv/clang-format/blacklist | 3
solenv/flatpak-manifest.in | 6
17 files changed, 339 insertions(+), 600 deletions(-)
New commits:
commit 2f23292ce4deedd65388ff8693134ad9070f343f
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Jun 16 15:09:50 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Jun 26 14:22:01 2020 +0200
mariadb: upgrade to release 3.1.8
Fixes CVE-2018-3081 CVE-2020-2574 CVE-2020-2752 CVE-2020-2922 CVE-2020-13249
Remove obsolete patches:
* mariadb-msvc.patch.1
* mariadb-swap.patch
* mariadb-inline.patch.1
* mariadb-CONC-104.patch.1
Don't build anything from plugins/ in the hope that it's not needed.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b)
mariadb: forgot to adapt flatpak-manifest.in
mariadb: the "pvio_socket" plugin turns out to be important
... otherwise can't connect to a TCP socket.
(regression from fe041bbc343ee08c6e901f63985d55a90da71c8b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546)
Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96519
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96984
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e01ba6670ced..def5fa9a0e72 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -262,6 +262,13 @@ $(call gb_LinkTarget_add_libs,$(1),\
-liconv \
)
endif
+$(call gb_LinkTarget_use_system_win32_libs,$(1),\
+ ws2_32 \
+ advapi32 \
+ kernel32 \
+ shlwapi \
+ crypt32 \
+)
endef
define gb_ExternalProject__use_mariadb-connector-c
diff --git a/download.lst b/download.lst
index 25cfc22e15a6..8f407f2bb34d 100644
--- a/download.lst
+++ b/download.lst
@@ -188,8 +188,8 @@ export LPSOLVE_SHA256SUM :=
171816288f14215c69e730f7a4f1c325739873e21f946ff83884
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export LXML_SHA256SUM :=
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
export LXML_TARBALL := lxml-4.1.1.tgz
-export MARIADB_CONNECTOR_C_SHA256SUM :=
fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
-export MARIADB_CONNECTOR_C_TARBALL :=
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
+export MARIADB_CONNECTOR_C_SHA256SUM :=
431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
+export MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
export MDDS_SHA256SUM :=
25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81
export MDDS_TARBALL := mdds-1.4.3.tar.bz2
export MDNSRESPONDER_SHA256SUM :=
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
diff --git a/external/mariadb-connector-c/README
b/external/mariadb-connector-c/README
index 03a1138b47f8..25209f97f4d2 100644
--- a/external/mariadb-connector-c/README
+++ b/external/mariadb-connector-c/README
@@ -1,16 +1,8 @@
-Update to new upstream bzr snapshot:
+MariaDB Connector/C
-Don't use 'bzr diff', it will not put renames in the diff in a way
-that patch understands.
+https://mariadb.com/kb/en/mariadb-connector-c-release-notes/
+https://downloads.mariadb.com/Connectors/c/
-bzr -Ossl.cert_reqs=none branch lp:mariadb-native-client
-mv mariadb-native-client mariadb-native-client.trunk
-cp -R mariadb-native-client.trunk mariadb-native-client.release
-cd mariadb-native-client.release
-bzr revert -r mariadb-native-client-1.0.0
-cd ..
-diff -x .bzr -u --recursive -N mariadb-native-client.release/
mariadb-native-client.trunk/ >
/path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
-sed -i -e 's@^\([+-]\{3\}
\)mariadb-native-client.\(trunk\|release\)/@\1mariadb/@'
/path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
-dos2unix -f /path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
+configs/ generated like this:
-regenerate configs
\ No newline at end of file
+cmake -DWITH_CURL=OFF -DWITH_SSL=OFF -DWITH_UNIT_TESTS=OFF -DWITH_DYNCOL=OFF
.../workdir/UnpackedTarball/mariadb-connector-c/
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 78641c53d27e..e134812d13c0 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -34,89 +34,40 @@ $(eval $(call
gb_StaticLibrary_set_include,mariadb-connector-c,\
endif
$(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
- UnpackedTarball/mariadb-connector-c/libmariadb/array \
- UnpackedTarball/mariadb-connector-c/libmariadb/ma_dyncol \
- UnpackedTarball/mariadb-connector-c/libmariadb/bchange \
- UnpackedTarball/mariadb-connector-c/libmariadb/bmove \
UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_charset \
- UnpackedTarball/mariadb-connector-c/libmariadb/hash \
- UnpackedTarball/mariadb-connector-c/libmariadb/violite \
- UnpackedTarball/mariadb-connector-c/libmariadb/net \
- UnpackedTarball/mariadb-connector-c/libmariadb/charset \
- UnpackedTarball/mariadb-connector-c/libmariadb/ma_time \
- UnpackedTarball/mariadb-connector-c/libmariadb/dbug \
- UnpackedTarball/mariadb-connector-c/libmariadb/default \
- UnpackedTarball/mariadb-connector-c/libmariadb/errmsg \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_vsnprintf \
- UnpackedTarball/mariadb-connector-c/libmariadb/errors \
- UnpackedTarball/mariadb-connector-c/libmariadb/getopt1 \
- UnpackedTarball/mariadb-connector-c/libmariadb/getopt \
UnpackedTarball/mariadb-connector-c/libmariadb/get_password \
- UnpackedTarball/mariadb-connector-c/libmariadb/int2str \
- UnpackedTarball/mariadb-connector-c/libmariadb/is_prefix \
- UnpackedTarball/mariadb-connector-c/libmariadb/libmariadb \
- UnpackedTarball/mariadb-connector-c/libmariadb/list \
- UnpackedTarball/mariadb-connector-c/libmariadb/llstr \
- UnpackedTarball/mariadb-connector-c/libmariadb/longlong2str \
- UnpackedTarball/mariadb-connector-c/libmariadb/mf_dirname \
- UnpackedTarball/mariadb-connector-c/libmariadb/mf_fn_ext \
- UnpackedTarball/mariadb-connector-c/libmariadb/mf_format \
- UnpackedTarball/mariadb-connector-c/libmariadb/mf_loadpath \
- UnpackedTarball/mariadb-connector-c/libmariadb/mf_pack \
- UnpackedTarball/mariadb-connector-c/libmariadb/mf_path \
- UnpackedTarball/mariadb-connector-c/libmariadb/mf_unixpath \
- UnpackedTarball/mariadb-connector-c/libmariadb/mf_wcomp \
- UnpackedTarball/mariadb-connector-c/libmariadb/mulalloc \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_alloc \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_compress \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_div \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_error \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_fopen \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_fstream \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_getwd \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_init \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_lib \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_malloc \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_messnc \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_net \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_once \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_open \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_port \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_pthread \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_read \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_realloc \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_seek \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_static \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_symlink \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_thr_init \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_write \
- UnpackedTarball/mariadb-connector-c/libmariadb/password \
- UnpackedTarball/mariadb-connector-c/libmariadb/str2int \
- UnpackedTarball/mariadb-connector-c/libmariadb/strcend \
- UnpackedTarball/mariadb-connector-c/libmariadb/strcont \
- UnpackedTarball/mariadb-connector-c/libmariadb/strend \
- UnpackedTarball/mariadb-connector-c/libmariadb/strfill \
- UnpackedTarball/mariadb-connector-c/libmariadb/string \
- UnpackedTarball/mariadb-connector-c/libmariadb/strinstr \
- UnpackedTarball/mariadb-connector-c/libmariadb/strmake \
- UnpackedTarball/mariadb-connector-c/libmariadb/strmov \
- UnpackedTarball/mariadb-connector-c/libmariadb/strnmov \
- UnpackedTarball/mariadb-connector-c/libmariadb/strtoll \
- UnpackedTarball/mariadb-connector-c/libmariadb/strtoull \
- UnpackedTarball/mariadb-connector-c/libmariadb/strxmov \
- UnpackedTarball/mariadb-connector-c/libmariadb/strxnmov \
- UnpackedTarball/mariadb-connector-c/libmariadb/thr_mutex \
- UnpackedTarball/mariadb-connector-c/libmariadb/typelib \
- UnpackedTarball/mariadb-connector-c/libmariadb/sha1 \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_stmt \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_loaddata \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_stmt_codec \
- UnpackedTarball/mariadb-connector-c/libmariadb/client_plugin \
- UnpackedTarball/mariadb-connector-c/libmariadb/my_auth \
- UnpackedTarball/mariadb-connector-c/libmariadb/ma_secure \
-$(if $(filter $(OS),WNT), \
- UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv,) \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_alloc \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_array \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_charset \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_compress \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_context \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_default \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_dtoa \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_errmsg \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_hash \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_init \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_io \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_list \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_ll2str \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_loaddata \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_net \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_password \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_pvio \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_sha1 \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_string \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_time \
+ UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_async \
+ UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_charset \
+ UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_dyncol \
+ UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_lib \
+ UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
+ UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
+ $(if $(filter $(OS),WNT), \
+ UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
+ UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv) \
))
# vim: set noet sw=4 ts=4:
diff --git
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index 71af2847a5b2..3d8ca9295131 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -11,27 +11,31 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,mariadb-connector-c))
$(eval $(call
gb_UnpackedTarball_set_tarball,mariadb-connector-c,$(MARIADB_CONNECTOR_C_TARBALL)))
-$(eval $(call
gb_UnpackedTarball_add_file,mariadb-connector-c,include/mysql_version.h,external/mariadb-connector-c/configs/mysql_version.h))
+$(eval $(call
gb_UnpackedTarball_add_file,mariadb-connector-c,include/mariadb_version.h,external/mariadb-connector-c/configs/mariadb_version.h))
-ifneq ($(OS),WNT)
+ifeq ($(OS),WNT)
+$(eval $(call
gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/wnt_ma_config.h))
+else
ifeq ($(OS),MACOSX)
-$(eval $(call
gb_UnpackedTarball_add_file,mariadb-connector-c,include/my_config.h,external/mariadb-connector-c/configs/mac_my_config.h))
+$(eval $(call
gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/mac_my_config.h))
else
-$(eval $(call
gb_UnpackedTarball_add_file,mariadb-connector-c,include/my_config.h,external/mariadb-connector-c/configs/linux_my_config.h))
+$(eval $(call
gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/linux_my_config.h))
endif
endif # $(OS),WNT
$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1))
-# mariadb-connector-c/mariadb-static-inline.patch upstream at
-# <https://mariadb.atlassian.net/browse/CONC-18> "no external definition of
-# non-static inline local_thr_alarm in libmariadb/net.c":
$(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
- external/mariadb-connector-c/mariadb-swap.patch \
- $(if $(filter
MSC,$(COM)),external/mariadb-connector-c/mariadb-msvc.patch.1) \
- external/mariadb-connector-c/mariadb-inline.patch.1 \
- external/mariadb-connector-c/mariadb-CONC-104.patch.1 \
external/mariadb-connector-c/clang-cl.patch.0 \
))
+# TODO are any "plugins" needed?
+$(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
+ < libmariadb/ma_client_plugin.c.in sed \
+ -e 's/@EXTERNAL_PLUGINS@/extern struct st_mysql_client_plugin
pvio_socket_client_plugin;/' \
+ -e 's/@BUILTIN_PLUGINS@/(struct st_mysql_client_plugin
*)\&pvio_socket_client_plugin$(COMMA)/' \
+ > libmariadb/ma_client_plugin.c \
+))
+
+
# vim: set noet sw=4 ts=4:
diff --git a/external/mariadb-connector-c/clang-cl.patch.0
b/external/mariadb-connector-c/clang-cl.patch.0
index 7a886e67cf7c..4c9ef4def3f6 100644
--- a/external/mariadb-connector-c/clang-cl.patch.0
+++ b/external/mariadb-connector-c/clang-cl.patch.0
@@ -1,5 +1,5 @@
---- libmariadb/getopt.c
-+++ libmariadb/getopt.c
+--- unittest/libmariadb/getopt.c
++++ unittest/libmariadb/getopt.c
@@ -38,7 +38,7 @@
#include <config.h>
#endif
diff --git a/external/mariadb-connector-c/configs/linux_my_config.h
b/external/mariadb-connector-c/configs/linux_my_config.h
index a52a62ce0cdd..577a6e163d68 100644
--- a/external/mariadb-connector-c/configs/linux_my_config.h
+++ b/external/mariadb-connector-c/configs/linux_my_config.h
@@ -2,277 +2,141 @@
/*
* Include file constants (processed in LibmysqlIncludeFiles.txt 1
*/
+/* #undef HAVE_OPENSSL_APPLINK_C */
#define HAVE_ALLOCA_H 1
-#define HAVE_ARPA_INET_H 1
-#define HAVE_CRYPT_H 1
-#define HAVE_DIRENT_H 1
+/* #undef HAVE_BIGENDIAN */
+#define HAVE_SETLOCALE 1
+#define HAVE_NL_LANGINFO 1
#define HAVE_DLFCN_H 1
-#define HAVE_EXECINFO_H 1
#define HAVE_FCNTL_H 1
-#define HAVE_FENV_H 1
#define HAVE_FLOAT_H 1
-/* #undef HAVE_FPU_CONTROL_H */
-#define HAVE_GRP_H 1
-/* #undef HAVE_IEEEFP_H */
#define HAVE_LIMITS_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_NETINET_IN_H 1
-#define HAVE_PATHS_H 1
#define HAVE_PWD_H 1
-#define HAVE_SCHED_H 1
/* #undef HAVE_SELECT_H */
#define HAVE_STDDEF_H 1
#define HAVE_STDINT_H 1
#define HAVE_STDLIB_H 1
#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-/* #undef HAVE_SYNCH_H */
-/* #undef HAVE_SYS_FPU_H */
#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_IPC_H 1
-#define HAVE_SYS_MMAN_H 1
-#define HAVE_SYS_PRCTL_H 1
#define HAVE_SYS_SELECT_H 1
-#define HAVE_SYS_SHM_H 1
#define HAVE_SYS_SOCKET_H 1
-#define HAVE_SYS_STAT_H 1
/* #undef HAVE_SYS_STREAM_H */
-#define HAVE_SYS_TIMEB_H 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_UN_H 1
-/* #undef HAVE_SYSENT_H */
-#define HAVE_TERMIO_H 1
-#define HAVE_TERMIOS_H 1
#define HAVE_UNISTD_H 1
-#define HAVE_UTIME_H 1
+#define HAVE_UCONTEXT_H 1
/*
* function definitions - processed in LibmysqlFunctions.txt
*/
-#define HAVE_ACCESS 1
-/* #undef HAVE_AIOWAIT */
-#define HAVE_ALARM 1
-/* #undef HAVE_ALLOCA */
-#define HAVE_BCMP 1
-/* #undef HAVE_BFILL */
-/* #undef HAVE_BMOVE */
-#define HAVE_BZERO 1
-#define HAVE_CLOCK_GETTIME 1
-/* #undef HAVE_COMPRESS */
-/* #undef HAVE_CRYPT */
-#define HAVE_DLERROR 1
-#define HAVE_DLOPEN 1
-#define HAVE_FCHMOD 1
-#define HAVE_FCNTL 1
-/* #undef HAVE_FCONVERT */
-#define HAVE_FDATASYNC 1
-#define HAVE_FESETROUND 1
-#define HAVE_FINITE 1
-#define HAVE_FSEEKO 1
-#define HAVE_FSYNC 1
-#define HAVE_GETADDRINFO 1
-#define HAVE_GETCWD 1
-#define HAVE_GETHOSTBYADDR_R 1
-#define HAVE_GETHOSTBYNAME_R 1
-/* #undef HAVE_GETHRTIME */
-#define HAVE_GETNAMEINFO 1
-#define HAVE_GETPAGESIZE 1
-#define HAVE_GETPASS 1
-/* #undef HAVE_GETPASSPHRASE */
-#define HAVE_GETPWNAM 1
+
+/* #undef HAVE_DLERROR */
+/* #undef HAVE_DLOPEN */
#define HAVE_GETPWUID 1
-#define HAVE_GETRLIMIT 1
-#define HAVE_GETRUSAGE 1
-#define HAVE_GETWD 1
-#define HAVE_GMTIME_R 1
-#define HAVE_INITGROUPS 1
-#define HAVE_LDIV 1
-#define HAVE_LOCALTIME_R 1
-#define HAVE_LOG2 1
-#define HAVE_LONGJMP 1
-#define HAVE_LSTAT 1
-#define HAVE_MADVISE 1
-#define HAVE_MALLINFO 1
-#define HAVE_MEMALIGN 1
#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MKSTEMP 1
-#define HAVE_MLOCK 1
-#define HAVE_MLOCKALL 1
-#define HAVE_MMAP 1
-#define HAVE_MMAP64 1
-#define HAVE_PERROR 1
#define HAVE_POLL 1
-#define HAVE_PREAD 1
-/* #undef HAVE_PTHREAD_ATTR_CREATE */
-#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
-/* #undef HAVE_PTHREAD_ATTR_SETPRIO */
-#define HAVE_PTHREAD_ATTR_SETSCHEDPARAM 1
-#define HAVE_PTHREAD_ATTR_SETSCOPE 1
-#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
-/* #undef HAVE_PTHREAD_CONDATTR_CREATE */
-/* #undef HAVE_PTHREAD_INIT */
-#define HAVE_PTHREAD_KEY_DELETE 1
-#define HAVE_PTHREAD_KILL 1
-#define HAVE_PTHREAD_RWLOCK_RDLOCK 1
-/* #undef HAVE_PTHREAD_SETPRIO_NP */
-#define HAVE_PTHREAD_SETSCHEDPARAM 1
-#define HAVE_PTHREAD_SIGMASK 1
-/* #undef HAVE_PTHREAD_THREADMASK */
-/* #undef HAVE_PTHREAD_YIELD_NP */
-#define HAVE_READDIR_R 1
-#define HAVE_READLINK 1
-#define HAVE_REALPATH 1
-#define HAVE_RENAME 1
-#define HAVE_SCHED_YIELD 1
-#define HAVE_SELECT 1
-/* #undef HAVE_SETFD */
-/* #undef HAVE_SETFILEPOINTER */
-#define HAVE_SIGNAL 1
-#define HAVE_SIGACTION 1
-/* #undef HAVE_SIGTHREADMASK */
-#define HAVE_SIGWAIT 1
-#define HAVE_SLEEP 1
-#define HAVE_SNPRINTF 1
-/* #undef HAVE_SQLITE */
-#define HAVE_STPCPY 1
-#define HAVE_STRERROR 1
-/* #undef HAVE_STRLCPY */
-#define HAVE_STRNLEN 1
-#define HAVE_STRPBRK 1
-#define HAVE_STRSEP 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOK_R 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOULL 1
+/* #undef HAVE_STRTOK_R */
+/* #undef HAVE_STRTOL */
+/* #undef HAVE_STRTOLL */
+/* #undef HAVE_STRTOUL */
+/* #undef HAVE_STRTOULL */
/* #undef HAVE_TELL */
/* #undef HAVE_THR_SETCONCURRENCY */
/* #undef HAVE_THR_YIELD */
-#define HAVE_VASPRINTF 1
-#define HAVE_VSNPRINTF 1
+/* #undef HAVE_VASPRINTF */
+/* #undef HAVE_VSNPRINTF */
+#define HAVE_CUSERID 1
/*
* types and sizes
*/
-/* Types we may use */
-#define SIZEOF_CHAR 1
-#if SIZEOF_CHAR
-# define HAVE_CHAR 1
-#endif
+
#define SIZEOF_CHARP 8
-#if SIZEOF_CHARP
+#if defined(SIZEOF_CHARP)
# define HAVE_CHARP 1
#endif
-#define SIZEOF_SHORT 2
-#if SIZEOF_SHORT
-# define HAVE_SHORT 1
-#endif
#define SIZEOF_INT 4
-#if SIZEOF_INT
+#if defined(SIZEOF_INT)
# define HAVE_INT 1
#endif
#define SIZEOF_LONG 8
-#if SIZEOF_LONG
+#if defined(SIZEOF_LONG)
# define HAVE_LONG 1
#endif
#define SIZEOF_LONG_LONG 8
-#if SIZEOF_LONG_LONG
+#if defined(SIZEOF_LONG_LONG)
# define HAVE_LONG_LONG 1
#endif
-#define SIZEOF_OFF_T 8
-#if SIZEOF_OFF_T
-# define HAVE_OFF_T 1
-#endif
-
-#define SIZEOF_SIGSET_T 128
-#if SIZEOF_SIGSET_T
-# define HAVE_SIGSET_T 1
-#endif
#define SIZEOF_SIZE_T 8
-#if SIZEOF_SIZE_T
+#if defined(SIZEOF_SIZE_T)
# define HAVE_SIZE_T 1
#endif
-/* #undef SIZEOF_UCHAR */
-#if SIZEOF_UCHAR
-# define HAVE_UCHAR 1
-#endif
#define SIZEOF_UINT 4
-#if SIZEOF_UINT
+#if defined(SIZEOF_UINT)
# define HAVE_UINT 1
#endif
#define SIZEOF_ULONG 8
-#if SIZEOF_ULONG
+#if defined(SIZEOF_ULONG)
# define HAVE_ULONG 1
#endif
/* #undef SIZEOF_INT8 */
-#if SIZEOF_INT8
+#if defined(SIZEOF_INT8)
# define HAVE_INT8 1
#endif
/* #undef SIZEOF_UINT8 */
-#if SIZEOF_UINT8
+#if defined(SIZEOF_UINT8)
# define HAVE_UINT8 1
#endif
/* #undef SIZEOF_INT16 */
-#if SIZEOF_INT16
+#if defined(SIZEOF_INT16)
# define HAVE_INT16 1
#endif
/* #undef SIZEOF_UINT16 */
-#if SIZEOF_UINT16
+#if defined(SIZEOF_UINT16)
# define HAVE_UINT16 1
#endif
/* #undef SIZEOF_INT32 */
-#if SIZEOF_INT32
+#if defined(SIZEOF_INT32)
# define HAVE_INT32 1
#endif
/* #undef SIZEOF_UINT32 */
-#if SIZEOF_UINT32
+#if defined(SIZEOF_UINT32)
# define HAVE_UINT32 1
#endif
-/* #undef SIZEOF_U_INT32_T */
-#if SIZEOF_U_INT32_T
-# define HAVE_U_INT32_T 1
-#endif
/* #undef SIZEOF_INT64 */
-#if SIZEOF_INT64
+#if defined(SIZEOF_INT64)
# define HAVE_INT64 1
#endif
/* #undef SIZEOF_UINT64 */
-#if SIZEOF_UINT64
+#if defined(SIZEOF_UINT64)
# define HAVE_UINT64 1
#endif
/* #undef SIZEOF_SOCKLEN_T */
-#if SIZEOF_SOCKLEN_T
+#if defined(SIZEOF_SOCKLEN_T)
# define HAVE_SOCKLEN_T 1
#endif
#define SOCKET_SIZE_TYPE socklen_t
-#define RETSIGTYPE void
-#define RETQSORTTYPE void
+#define LOCAL_INFILE_MODE_OFF 0
+#define LOCAL_INFILE_MODE_ON 1
+#define LOCAL_INFILE_MODE_AUTO 2
+#define ENABLED_LOCAL_INFILE LOCAL_INFILE_MODE_AUTO
-/*
- * various other defines
- */
-/* #undef HAVE_THREADS */
-#define SHAREDIR "share"
-#define DEFAULT_CHARSET_HOME "/usr/local"
-#define PLUGINDIR "/usr/local/lib/plugin"
+#define MARIADB_DEFAULT_CHARSET "latin1"
diff --git a/external/mariadb-connector-c/configs/mac_my_config.h
b/external/mariadb-connector-c/configs/mac_my_config.h
index 766c757c27e5..c94856115b95 100644
--- a/external/mariadb-connector-c/configs/mac_my_config.h
+++ b/external/mariadb-connector-c/configs/mac_my_config.h
@@ -1,277 +1,142 @@
-#define HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE 1
-
/*
* Include file constants (processed in LibmysqlIncludeFiles.txt 1
*/
+/* #undef HAVE_OPENSSL_APPLINK_C */
#define HAVE_ALLOCA_H 1
-#define HAVE_ARPA_INET_H 1
-/* #undef HAVE_CRYPT_H */
-#define HAVE_DIRENT_H 1
+/* #undef HAVE_BIGENDIAN */
+#define HAVE_SETLOCALE 1
+#define HAVE_NL_LANGINFO 1
#define HAVE_DLFCN_H 1
-#define HAVE_EXECINFO_H 1
#define HAVE_FCNTL_H 1
-#define HAVE_FENV_H 1
#define HAVE_FLOAT_H 1
-/* #undef HAVE_FPU_CONTROL_H */
-#define HAVE_GRP_H 1
-/* #undef HAVE_IEEEFP_H */
#define HAVE_LIMITS_H 1
-/* #undef HAVE_MALLOC_H */
-#define HAVE_MEMORY_H 1
-#define HAVE_NETINET_IN_H 1
-#define HAVE_PATHS_H 1
#define HAVE_PWD_H 1
-#define HAVE_SCHED_H 1
/* #undef HAVE_SELECT_H */
#define HAVE_STDDEF_H 1
#define HAVE_STDINT_H 1
#define HAVE_STDLIB_H 1
#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-/* #undef HAVE_SYNCH_H */
-/* #undef HAVE_SYS_FPU_H */
#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_IPC_H 1
-#define HAVE_SYS_MMAN_H 1
-/* #undef HAVE_SYS_PRCTL_H */
#define HAVE_SYS_SELECT_H 1
-#define HAVE_SYS_SHM_H 1
#define HAVE_SYS_SOCKET_H 1
-#define HAVE_SYS_STAT_H 1
/* #undef HAVE_SYS_STREAM_H */
-#define HAVE_SYS_TIMEB_H 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_UN_H 1
-/* #undef HAVE_SYSENT_H */
-/* #undef HAVE_TERMIO_H */
-#define HAVE_TERMIOS_H 1
#define HAVE_UNISTD_H 1
-#define HAVE_UTIME_H 1
+/* #undef HAVE_UCONTEXT_H */
/*
- * function definitions - processed in LibmysqlFunctions.txt
+ * function definitions - processed in LibmysqlFunctions.txt
*/
-#define HAVE_ACCESS 1
-/* #undef HAVE_AIOWAIT */
-#define HAVE_ALARM 1
-/* #undef HAVE_ALLOCA */
-#define HAVE_BCMP 1
-/* #undef HAVE_BFILL */
-/* #undef HAVE_BMOVE */
-#define HAVE_BZERO 1
-/* #undef HAVE_CLOCK_GETTIME */
-/* #undef HAVE_COMPRESS */
-#define HAVE_CRYPT 1
+
#define HAVE_DLERROR 1
#define HAVE_DLOPEN 1
-#define HAVE_FCHMOD 1
-#define HAVE_FCNTL 1
-/* #undef HAVE_FCONVERT */
-/* #undef HAVE_FDATASYNC */
-#define HAVE_FESETROUND 1
-#define HAVE_FINITE 1
-#define HAVE_FSEEKO 1
-#define HAVE_FSYNC 1
-#define HAVE_GETADDRINFO 1
-#define HAVE_GETCWD 1
-/* #undef HAVE_GETHOSTBYADDR_R */
-/* #undef HAVE_GETHOSTBYNAME_R */
-/* #undef HAVE_GETHRTIME */
-#define HAVE_GETNAMEINFO 1
-#define HAVE_GETPAGESIZE 1
-#define HAVE_GETPASS 1
-/* #undef HAVE_GETPASSPHRASE */
-#define HAVE_GETPWNAM 1
#define HAVE_GETPWUID 1
-#define HAVE_GETRLIMIT 1
-#define HAVE_GETRUSAGE 1
-#define HAVE_GETWD 1
-#define HAVE_GMTIME_R 1
-#define HAVE_INITGROUPS 1
-#define HAVE_LDIV 1
-#define HAVE_LOCALTIME_R 1
-#define HAVE_LOG2 1
-#define HAVE_LONGJMP 1
-#define HAVE_LSTAT 1
-#define HAVE_MADVISE 1
-/* #undef HAVE_MALLINFO */
-/* #undef HAVE_MEMALIGN */
#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MKSTEMP 1
-#define HAVE_MLOCK 1
-#define HAVE_MLOCKALL 1
-#define HAVE_MMAP 1
-/* #undef HAVE_MMAP64 */
-#define HAVE_PERROR 1
#define HAVE_POLL 1
-#define HAVE_PREAD 1
-/* #undef HAVE_PTHREAD_ATTR_CREATE */
-#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
-/* #undef HAVE_PTHREAD_ATTR_SETPRIO */
-#define HAVE_PTHREAD_ATTR_SETSCHEDPARAM 1
-#define HAVE_PTHREAD_ATTR_SETSCOPE 1
-#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
-/* #undef HAVE_PTHREAD_CONDATTR_CREATE */
-/* #undef HAVE_PTHREAD_INIT */
-#define HAVE_PTHREAD_KEY_DELETE 1
-#define HAVE_PTHREAD_KILL 1
-#define HAVE_PTHREAD_RWLOCK_RDLOCK 1
-/* #undef HAVE_PTHREAD_SETPRIO_NP */
-#define HAVE_PTHREAD_SETSCHEDPARAM 1
-#define HAVE_PTHREAD_SIGMASK 1
-/* #undef HAVE_PTHREAD_THREADMASK */
-#define HAVE_PTHREAD_YIELD_NP 1
-#define HAVE_READDIR_R 1
-#define HAVE_READLINK 1
-#define HAVE_REALPATH 1
-#define HAVE_RENAME 1
-#define HAVE_SCHED_YIELD 1
-#define HAVE_SELECT 1
-/* #undef HAVE_SETFD */
-/* #undef HAVE_SETFILEPOINTER */
-#define HAVE_SIGNAL 1
-#define HAVE_SIGACTION 1
-/* #undef HAVE_SIGTHREADMASK */
-#define HAVE_SIGWAIT 1
-#define HAVE_SLEEP 1
-#define HAVE_SNPRINTF 1
-#define HAVE_STPCPY 1
-#define HAVE_STRERROR 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRNLEN 1
-#define HAVE_STRPBRK 1
-#define HAVE_STRSEP 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOK_R 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOULL 1
+/* #undef HAVE_STRTOK_R */
+/* #undef HAVE_STRTOL */
+/* #undef HAVE_STRTOLL */
+/* #undef HAVE_STRTOUL */
+/* #undef HAVE_STRTOULL */
/* #undef HAVE_TELL */
/* #undef HAVE_THR_SETCONCURRENCY */
/* #undef HAVE_THR_YIELD */
-#define HAVE_VASPRINTF 1
-#define HAVE_VSNPRINTF 1
+/* #undef HAVE_VASPRINTF */
+/* #undef HAVE_VSNPRINTF */
+/* #undef HAVE_CUSERID */
/*
* types and sizes
*/
-/* Types we may use */
-#define SIZEOF_CHAR 1
-#ifdef SIZEOF_CHAR
-# define HAVE_CHAR 1
-#endif
-#define SIZEOF_CHARP 4
-#ifdef SIZEOF_CHARP
+
+#define SIZEOF_CHARP 8
+#if defined(SIZEOF_CHARP)
# define HAVE_CHARP 1
#endif
-#define SIZEOF_SHORT 2
-#ifdef SIZEOF_SHORT
-# define HAVE_SHORT 1
-#endif
#define SIZEOF_INT 4
-#ifdef SIZEOF_INT
+#if defined(SIZEOF_INT)
# define HAVE_INT 1
#endif
-#define SIZEOF_LONG 4
-#ifdef SIZEOF_LONG
+#define SIZEOF_LONG 8
+#if defined(SIZEOF_LONG)
# define HAVE_LONG 1
#endif
#define SIZEOF_LONG_LONG 8
-#ifdef SIZEOF_LONG_LONG
+#if defined(SIZEOF_LONG_LONG)
# define HAVE_LONG_LONG 1
#endif
-#define SIZEOF_OFF_T 8
-#ifdef SIZEOF_OFF_T
-# define HAVE_OFF_T 1
-#endif
-#define SIZEOF_SIGSET_T 4
-#ifdef SIZEOF_SIGSET_T
-# define HAVE_SIGSET_T 1
-#endif
-
-#define SIZEOF_SIZE_T 4
-#ifdef SIZEOF_SIZE_T
+#define SIZEOF_SIZE_T 8
+#if defined(SIZEOF_SIZE_T)
# define HAVE_SIZE_T 1
#endif
-/* #undef SIZEOF_UCHAR */
-#ifdef SIZEOF_UCHAR
-# define HAVE_UCHAR 1
-#endif
#define SIZEOF_UINT 4
-#ifdef SIZEOF_UINT
+#if defined(SIZEOF_UINT)
# define HAVE_UINT 1
#endif
/* #undef SIZEOF_ULONG */
-#ifdef SIZEOF_ULONG
+#if defined(SIZEOF_ULONG)
# define HAVE_ULONG 1
#endif
/* #undef SIZEOF_INT8 */
-#ifdef SIZEOF_INT8
+#if defined(SIZEOF_INT8)
# define HAVE_INT8 1
#endif
/* #undef SIZEOF_UINT8 */
-#ifdef SIZEOF_UINT8
+#if defined(SIZEOF_UINT8)
# define HAVE_UINT8 1
#endif
/* #undef SIZEOF_INT16 */
-#ifdef SIZEOF_INT16
+#if defined(SIZEOF_INT16)
# define HAVE_INT16 1
#endif
/* #undef SIZEOF_UINT16 */
-#ifdef SIZEOF_UINT16
+#if defined(SIZEOF_UINT16)
# define HAVE_UINT16 1
#endif
/* #undef SIZEOF_INT32 */
-#ifdef SIZEOF_INT32
+#if defined(SIZEOF_INT32)
# define HAVE_INT32 1
#endif
/* #undef SIZEOF_UINT32 */
-#ifdef SIZEOF_UINT32
+#if defined(SIZEOF_UINT32)
# define HAVE_UINT32 1
#endif
-/* #undef SIZEOF_U_INT32_T */
-#ifdef SIZEOF_U_INT32_T
-# define HAVE_U_INT32_T 1
-#endif
/* #undef SIZEOF_INT64 */
-#ifdef SIZEOF_INT64
+#if defined(SIZEOF_INT64)
# define HAVE_INT64 1
#endif
/* #undef SIZEOF_UINT64 */
-#ifdef SIZEOF_UINT64
+#if defined(SIZEOF_UINT64)
# define HAVE_UINT64 1
#endif
/* #undef SIZEOF_SOCKLEN_T */
-#ifdef SIZEOF_SOCKLEN_T
+#if defined(SIZEOF_SOCKLEN_T)
# define HAVE_SOCKLEN_T 1
#endif
#define SOCKET_SIZE_TYPE socklen_t
-#define RETSIGTYPE void
-#define RETQSORTTYPE void
+#define LOCAL_INFILE_MODE_OFF 0
+#define LOCAL_INFILE_MODE_ON 1
+#define LOCAL_INFILE_MODE_AUTO 2
+#define ENABLED_LOCAL_INFILE LOCAL_INFILE_MODE_AUTO
+
+#define MARIADB_DEFAULT_CHARSET "latin1"
-/*
- * various other defines
- */
-/* #undef HAVE_THREADS */
-#define SHAREDIR "share"
-#define DEFAULT_CHARSET_HOME "/usr/local"
diff --git a/external/mariadb-connector-c/configs/mariadb_version.h
b/external/mariadb-connector-c/configs/mariadb_version.h
new file mode 100644
index 000000000000..7344982a6d29
--- /dev/null
+++ b/external/mariadb-connector-c/configs/mariadb_version.h
@@ -0,0 +1,38 @@
+/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
+ This file is public domain and comes with NO WARRANTY of any kind */
+
+/* Version numbers for protocol & mysqld */
+
+#ifndef _mariadb_version_h_
+#define _mariadb_version_h_
+
+#ifdef _CUSTOMCONFIG_
+#include <custom_conf.h>
+#else
+#define PROTOCOL_VERSION 10
+#define MARIADB_CLIENT_VERSION_STR "10.4.3"
+#define MARIADB_BASE_VERSION "mariadb-10.4"
+#define MARIADB_VERSION_ID 100403
+#define MARIADB_PORT 3306
+#define MARIADB_UNIX_ADDR "/tmp/mysql.sock"
+
+#define MYSQL_CONFIG_NAME "my"
+#define MYSQL_VERSION_ID 100403
+#define MYSQL_SERVER_VERSION "10.4.3-MariaDB"
+
+#define MARIADB_PACKAGE_VERSION "3.1.8"
+#define MARIADB_PACKAGE_VERSION_ID 30108
+#define MARIADB_SYSTEM_TYPE "Linux"
+#define MARIADB_MACHINE_TYPE "x86_64"
+#define MARIADB_PLUGINDIR "/usr/local/lib/mariadb/plugin"
+
+/* mysqld compile time options */
+#ifndef MYSQL_CHARSET
+#define MYSQL_CHARSET ""
+#endif
+#endif
+
+/* Source information */
+#define CC_SOURCE_REVISION ""
+
+#endif /* _mariadb_version_h_ */
diff --git a/external/mariadb-connector-c/configs/mysql_version.h
b/external/mariadb-connector-c/configs/mysql_version.h
deleted file mode 100644
index 050e861b7b91..000000000000
--- a/external/mariadb-connector-c/configs/mysql_version.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
- This file is public domain and comes with NO WARRANTY of any kind */
-
-/* Version numbers for protocol & mysqld */
-
-#ifdef _CUSTOMCONFIG_
-#include <custom_conf.h>
-#else
-#define PROTOCOL_VERSION 10
-#define MYSQL_CLIENT_VERSION "5.5.0"
-#define MYSQL_SERVER_VERSION "5.5.0"
-#define MYSQL_SERVER_SUFFIX ""
-#define FRM_VER
-#define MYSQL_VERSION_ID 50500
-#define MYSQL_PORT 3306
-#define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
-#define MYSQL_CONFIG_NAME "my"
-
-#define MARIADB_PACKAGE_VERSION "1.1.2"
-#define MARIADB_SYSTEM_TYPE "Linux"
-#define MARIADB_MACHINE_TYPE "x86_64"
-
-/* mysqld compile time options */
-#ifndef MYSQL_CHARSET
-#define MYSQL_CHARSET ""
-#endif
-#endif
-
diff --git a/external/mariadb-connector-c/configs/wnt_ma_config.h
b/external/mariadb-connector-c/configs/wnt_ma_config.h
new file mode 100644
index 000000000000..d06393509881
--- /dev/null
+++ b/external/mariadb-connector-c/configs/wnt_ma_config.h
@@ -0,0 +1,154 @@
+
+/*
+ * Include file constants (processed in LibmysqlIncludeFiles.txt 1
+ */
+/* #undef HAVE_OPENSSL_APPLINK_C */
+/* #undef HAVE_ALLOCA_H */
+/* #undef HAVE_BIGENDIAN */
+#define HAVE_SETLOCALE 1
+/* #undef HAVE_NL_LANGINFO */
+/* #undef HAVE_DLFCN_H */
+#define HAVE_FCNTL_H 1
+#define HAVE_FLOAT_H 1
+#define HAVE_LIMITS_H 1
+/* #undef HAVE_PWD_H */
+/* #undef HAVE_SELECT_H */
+#define HAVE_STDDEF_H 1
+/* #undef HAVE_STDINT_H */
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+/* #undef HAVE_SYS_IOCTL_H */
+/* #undef HAVE_SYS_SELECT_H */
+/* #undef HAVE_SYS_SOCKET_H */
+/* #undef HAVE_SYS_STREAM_H */
+#define HAVE_SYS_TYPES_H 1
+/* #undef HAVE_SYS_UN_H */
+/* #undef HAVE_UNISTD_H */
+/* #undef HAVE_UCONTEXT_H */
+
+/*
+ * function definitions - processed in LibmysqlFunctions.txt
+ */
+
+/* #undef HAVE_DLERROR */
+/* #undef HAVE_DLOPEN */
+/* #undef HAVE_GETPWUID */
+#define HAVE_MEMCPY 1
+/* #undef HAVE_POLL */
+/* #undef HAVE_STRTOK_R */
+#define HAVE_STRTOL 1
+/* #undef HAVE_STRTOLL */
+#define HAVE_STRTOUL 1
+/* #undef HAVE_STRTOULL */
+#define HAVE_TELL 1
+/* #undef HAVE_THR_SETCONCURRENCY */
+/* #undef HAVE_THR_YIELD */
+/* #undef HAVE_VASPRINTF */
+#define HAVE_VSNPRINTF 1
+/* #undef HAVE_CUSERID */
+
+/*
+ * types and sizes
+ */
+
+
+#ifdef _M_X64
+#define SIZEOF_CHARP 8
+#else
+#define SIZEOF_CHARP 4
+#endif
+#if defined(SIZEOF_CHARP)
+# define HAVE_CHARP 1
+#endif
+
+
+#define SIZEOF_INT 4
+#if defined(SIZEOF_INT)
+# define HAVE_INT 1
+#endif
+
+#define SIZEOF_LONG 4
+#if defined(SIZEOF_LONG)
+# define HAVE_LONG 1
+#endif
+
+#ifdef _M_X64
+#define SIZEOF_LONG_LONG 8
+#else
+#define SIZEOF_LONG_LONG 4
+#endif
+#if defined(SIZEOF_LONG_LONG)
+# define HAVE_LONG_LONG 1
+#endif
+
+
+#ifdef _M_X64
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
+#if defined(SIZEOF_SIZE_T)
+# define HAVE_SIZE_T 1
+#endif
+
+
+/* #undef SIZEOF_UINT */
+#if defined(SIZEOF_UINT)
+# define HAVE_UINT 1
+#endif
+
+/* #undef SIZEOF_ULONG */
+#if defined(SIZEOF_ULONG)
+# define HAVE_ULONG 1
+#endif
+
+/* #undef SIZEOF_INT8 */
+#if defined(SIZEOF_INT8)
+# define HAVE_INT8 1
+#endif
+/* #undef SIZEOF_UINT8 */
+#if defined(SIZEOF_UINT8)
+# define HAVE_UINT8 1
+#endif
+
+/* #undef SIZEOF_INT16 */
+#if defined(SIZEOF_INT16)
+# define HAVE_INT16 1
+#endif
+/* #undef SIZEOF_UINT16 */
+#if defined(SIZEOF_UINT16)
+# define HAVE_UINT16 1
+#endif
+
+/* #undef SIZEOF_INT32 */
+#if defined(SIZEOF_INT32)
+# define HAVE_INT32 1
+#endif
+/* #undef SIZEOF_UINT32 */
+#if defined(SIZEOF_UINT32)
+# define HAVE_UINT32 1
+#endif
+
+/* #undef SIZEOF_INT64 */
+#if defined(SIZEOF_INT64)
+# define HAVE_INT64 1
+#endif
+/* #undef SIZEOF_UINT64 */
+#if defined(SIZEOF_UINT64)
+# define HAVE_UINT64 1
+#endif
+
+/* #undef SIZEOF_SOCKLEN_T */
+#if defined(SIZEOF_SOCKLEN_T)
+# define HAVE_SOCKLEN_T 1
+#endif
+
+#define SOCKET_SIZE_TYPE int
+
+#define LOCAL_INFILE_MODE_OFF 0
+#define LOCAL_INFILE_MODE_ON 1
+#define LOCAL_INFILE_MODE_AUTO 2
+#define ENABLED_LOCAL_INFILE LOCAL_INFILE_MODE_AUTO
+
+#define MARIADB_DEFAULT_CHARSET "latin1"
+
diff --git a/external/mariadb-connector-c/mariadb-CONC-104.patch.1
b/external/mariadb-connector-c/mariadb-CONC-104.patch.1
deleted file mode 100644
index cba9fbba339d..000000000000
--- a/external/mariadb-connector-c/mariadb-CONC-104.patch.1
+++ /dev/null
@@ -1,49 +0,0 @@
---- mariadb/include/errmsg.h 2014-04-04 12:21:01.000000000 +0200
-+++ mariadb/include/errmsg.h 2014-09-17 17:47:25.000000000 +0200
-@@ -66,6 +66,7 @@
- #define CR_PARAMS_NOT_BOUND 2031
- #define CR_INVALID_PARAMETER_NO 2034
- #define CR_UNSUPPORTED_PARAM_TYPE 2036
-+#define CR_SECURE_AUTH 2049
- #define CR_NO_DATA 2051
- #define CR_NO_STMT_METADATA 2052
- #define CR_NOT_IMPLEMENTED 2054
---- mariadb/libmariadb/errmsg.c 2014-04-04 12:21:01.000000000 +0200
-+++ mariadb/libmariadb/errmsg.c 2014-09-17 17:48:44.000000000 +0200
-@@ -129,7 +129,7 @@
- /* 2046 */ "",
- /* 2047 */ "",
- /* 2048 */ "",
--/* 2049 */ "",
-+/* 2049 */ "Connection with old authentication protocol refused.",
- /* 2050 */ "",
- /* 2051 */ "",
- /* 2052 */ "Prepared statement contains no metadata",
---- mariadb/libmariadb/libmariadb.c 2014-04-04 12:21:01.000000000 +0200
-+++ mariadb/libmariadb/libmariadb.c 2014-09-17 17:56:13.000000000 +0200
-@@ -1864,7 +1864,14 @@
- scramble_plugin= native_password_plugin_name;
- }
- } else
-+ {
- mysql->server_capabilities&= ~CLIENT_SECURE_CONNECTION;
-+ if (mysql->options.secure_auth)
-+ {
-+ SET_CLIENT_ERROR(mysql, CR_SECURE_AUTH, unknown_sqlstate, 0);
-+ goto error;
-+ }
-+ }
-
- /* Set character set */
- if (mysql->options.charset_name)
-@@ -3031,7 +3038,9 @@
- }
- }
- break;
--
-+ case MYSQL_SECURE_AUTH:
-+ mysql->options.secure_auth= *(my_bool *)arg1;
-+ break;
- default:
- va_end(ap);
- DBUG_RETURN(-1);
diff --git a/external/mariadb-connector-c/mariadb-inline.patch.1
b/external/mariadb-connector-c/mariadb-inline.patch.1
deleted file mode 100644
index 84ebc814069e..000000000000
--- a/external/mariadb-connector-c/mariadb-inline.patch.1
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur mariadb.org/libmariadb/hash.c mariadb/libmariadb/hash.c
---- mariadb.org/libmariadb/hash.c 2014-09-03 14:57:29.000000000 +0200
-+++ mariadb/libmariadb/hash.c 2014-09-03 14:59:09.000000000 +0200
-@@ -94,7 +94,7 @@
- handle inline functions that are not defined as native types
- */
-
--inline char*
-+uchar*
- hash_key(HASH *hash,const uchar *record,uint *length,my_bool first)
- {
- if (hash->get_key)
-@@ -191,9 +191,6 @@
- #endif
-
-
--#ifndef __SUNPRO_C /* SUNPRO can't handle this */
--inline
--#endif
- unsigned int rec_hashnr(HASH *hash,const uchar *record)
- {
- uint length;
-
diff --git a/external/mariadb-connector-c/mariadb-msvc.patch.1
b/external/mariadb-connector-c/mariadb-msvc.patch.1
deleted file mode 100644
index b88f00f8d309..000000000000
--- a/external/mariadb-connector-c/mariadb-msvc.patch.1
+++ /dev/null
@@ -1,13 +0,0 @@
---- mariadb/libmariadb/my_pthread.c.orig 2013-04-17 15:45:52.025896770
+0200
-+++ mariadb/libmariadb/my_pthread.c 2013-04-17 15:47:32.292895908 +0200
-@@ -28,6 +28,10 @@
-
- #ifdef _WIN32
-
-+#ifndef ETIMEDOUT /* does not exist MSVC 2008 but was added in MSVC 2010 */
-+#define ETIMEDOUT 145
-+#endif
-+
- int
- pthread_cond_init (pthread_cond_t *cv, const pthread_condattr_t *attr)
- {
diff --git a/external/mariadb-connector-c/mariadb-swap.patch
b/external/mariadb-connector-c/mariadb-swap.patch
deleted file mode 100644
index bfada2d2c4a6..000000000000
--- a/external/mariadb-connector-c/mariadb-swap.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- mariadb/include/global.h 2013-03-06 17:06:42.545906061 +0100
-+++ mariadb/include/global.h 2013-03-07 14:45:03.811128674 +0100
-@@ -247,7 +247,9 @@
- #endif
-
- #define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)
-+#ifndef __cplusplus
- #define swap(t,a,b) { register t dummy; dummy = a; a = b; b = dummy; }
-+#endif
- #define test(a) ((a) ? 1 : 0)
- #define set_if_bigger(a,b) { if ((a) < (b)) (a)=(b); }
- #define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); }
---- mariadb/include/my_global.h 2013-03-06 17:06:42.546906037 +0100
-+++ mariadb/include/my_global.h 2013-03-07 14:44:47.032529753 +0100
-@@ -278,7 +278,9 @@
- #endif
-
- #define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)
-+#ifndef __cplusplus
- #define swap(t,a,b) { register t dummy; dummy = a; a = b; b = dummy; }
-+#endif
- #define test(a) ((a) ? 1 : 0)
- #define set_if_bigger(a,b) { if ((a) < (b)) (a)=(b); }
- #define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); }
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index a3c7cd256659..7c308fc422cb 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -4621,7 +4621,8 @@ external/clucene/configs/clucene-config-generic.h
external/libpng/configs/pnglibconf.h
external/mariadb-connector-c/configs/linux_my_config.h
external/mariadb-connector-c/configs/mac_my_config.h
-external/mariadb-connector-c/configs/mysql_version.h
+external/mariadb-connector-c/configs/wnt_ma_config.h
+external/mariadb-connector-c/configs/mariadb_version.h
external/neon/configs/config.h
external/redland/raptor/raptor2.h
external/redland/raptor/raptor_config.h
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 2d164b084729..8488944c2465 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -324,10 +324,10 @@
"dest-filename":
"external/tarballs/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
},
{
- "url":
"https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";,
- "sha256":
"fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60",
+ "url":
"https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz";,
+ "sha256":
"431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b",
"type": "file",
- "dest-filename":
"external/tarballs/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+ "dest-filename":
"external/tarballs/mariadb-connector-c-3.1.8-src.tar.gz"
},
{
"url":
"https://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2";,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
