[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/mariadb-connector-c

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |    1 +
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 0dd4e5d3556b08f04f48a6a6b7321ea497cf556a
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jun 17 14:59:30 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Jun 17 17:53:31 2020 +0200

    mariadb: the "pvio_socket" plugin turns out to be important
    
    ... otherwise can't connect to a TCP socket.
    
    (regression from fe041bbc343ee08c6e901f63985d55a90da71c8b)
    
    Change-Id: I2a1f2968321aae108bfef67f602f06efcf3affd8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96508

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index d32eda7f71d1..b0c62e1b160e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
 	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) \
diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index cf0d2eb06cfa..3d8ca9295131 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -31,7 +31,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
 
 # 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@//' -e 's/@BUILTIN_PLUGINS@//' > libmariadb/ma_client_plugin.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  \
 ))