MDEV-12938 Discrepancy between mysql_config and mariadb_configbb-10.2-serg-mariadb_config

8 files changed, 9 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 30b1521ce92..79f81d42ee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,6 +105,7 @@ plugin/aws_key_management/aws_sdk_cpp-prefix
 scripts/comp_sql
 scripts/make_binary_distribution
 scripts/msql2mysql
+scripts/mariadb_config
 scripts/mysql_config
 scripts/mysql_config.pl
 scripts/mysql_convert_table_format
diff --git a/cmake/for_clients.cmake b/cmake/for_clients.cmake
index 636610e7fba..e5916c56ddc 100644
--- a/cmake/for_clients.cmake
+++ b/cmake/for_clients.cmake
@@ -45,7 +45,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
   ENDIF()
 ENDMACRO()
 
-EXTRACT_LINK_LIBRARIES(mariadb LIBS)
+EXTRACT_LINK_LIBRARIES(libmariadb LIBS)
 EXTRACT_LINK_LIBRARIES(mysqlserver EMB_LIBS)
 
 SET(LIBS     "-lmariadb ${ZLIB_DEPS} ${LIBS} ${openssl_libs}")
@@ -72,6 +72,6 @@ REPLACE_FOR_CLIENTS(CFLAGS "[DU]DBUG_OFF" "[DU]SAFE_MUTEX" "[DU]NDEBUG"
   "xstrconst" "xc99=none" "AC99" "restrict" "W[-A-Za-z]*=[-A-Za-z0-9]*")
 
 # Same for --libs
-REPLACE_FOR_CLIENTS(LIBS lmtmalloc static-libcxa i-static static-intel)
+REPLACE_FOR_CLIENTS(LIBS "Wl,[^ ]*" lmtmalloc static-libcxa i-static static-intel)
 REPLACE_FOR_CLIENTS(EMB_LIBS lmtmalloc static-libcxa i-static static-intel)
 
diff --git a/cmake/mariadb_connector_c.cmake b/cmake/mariadb_connector_c.cmake
index 400fcda0c1a..f11cfff557b 100644
--- a/cmake/mariadb_connector_c.cmake
+++ b/cmake/mariadb_connector_c.cmake
@@ -49,6 +49,7 @@ ENDIF()
 
 SET(PLUGIN_INSTALL_DIR ${INSTALL_PLUGINDIR})
 SET(MARIADB_UNIX_ADDR ${MYSQL_UNIX_ADDR})
+SET(NO_MARIADB_CONFIG ON)
 
 MESSAGE("== Configuring MariaDB Connector/C")
 ADD_SUBDIRECTORY(libmariadb)
diff --git a/libmariadb b/libmariadb
-Subproject b9b030f4dcff923e43edea9eae78f19e02a4724
+Subproject b578bf3bb85f1bc7d32be693628fd9177133334
diff --git a/mysql-test/include/require_openssl_client.inc b/mysql-test/include/require_openssl_client.inc
deleted file mode 100644
index 9b19960041b..00000000000
--- a/mysql-test/include/require_openssl_client.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-if ($CLIENT_TLS_LIBRARY != "OpenSSL") {
-  if ($CLIENT_TLS_LIBRARY != "LibreSSL") {
-    skip "Test requires Connector/C with OpenSSL library";
-  }
-}
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e4a44214ce8..efb3b604c4c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2279,11 +2279,6 @@ sub environment_setup {
   $ENV{'MYSQL_PLUGIN'}=             $exe_mysql_plugin;
   $ENV{'MYSQL_EMBEDDED'}=           $exe_mysql_embedded;
 
-  my $client_config_exe=
-    native_path("$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config");
-  my $tls_info= `$client_config_exe --tlsinfo`;
-  ($ENV{CLIENT_TLS_LIBRARY},$ENV{CLIENT_TLS_LIBRARY_VERSION})=
-    split(/ /, $tls_info, 2);
   my $exe_mysqld= find_mysqld($basedir);
   $ENV{'MYSQLD'}= $exe_mysqld;
   my $extra_opts= join (" ", @opt_extra_mysqld_opt);
diff --git a/mysql-test/t/openssl_6975.test b/mysql-test/t/openssl_6975.test
index 6a82d013fb6..49889a36a23 100644
--- a/mysql-test/t/openssl_6975.test
+++ b/mysql-test/t/openssl_6975.test
@@ -4,7 +4,6 @@
 # test SSLv3 and TLSv1.2 ciphers when OpenSSL is restricted to SSLv3 or TLSv1.2
 #
 source include/have_ssl_communication.inc;
-source include/require_openssl_client.inc;
 
 # this is OpenSSL test.
 
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index c789ee2ae63..9d15e9dd171 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -309,6 +309,11 @@ ELSE()
       COMPONENT ${${file}_COMPONENT}
      )
   ENDFOREACH()
+  INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+                                 mysql_config
+                                 ${INSTALL_BINDIR}/mariadb_config
+                                WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX})"
+          ${mysql_config_COMPONENT})
 ENDIF()
 
 # Install libgcc as  mylibgcc.a