Merge branch 'bb-10.3-cc' into 10.3

cmake/mariadb_connector_c.cmake

@@ -34,5 +34,9 @@ ENDIF()
 SET(PLUGIN_INSTALL_DIR ${INSTALL_PLUGINDIR})
 SET(MARIADB_UNIX_ADDR ${MYSQL_UNIX_ADDR})
 
+SET(CLIENT_PLUGIN_PVIO_NPIPE STATIC)
+SET(CLIENT_PLUGIN_PVIO_SHMEM STATIC)
+SET(CLIENT_PLUGIN_PVIO_SOCKET STATIC)
+
 MESSAGE("== Configuring MariaDB Connector/C")
 ADD_SUBDIRECTORY(libmariadb)

libmariadb @ a12a0b83

-Subproject commit 27b2f3d1f1550dfaee0f63a331a406ab31c1b37e
+Subproject commit a12a0b8362fe8c92ec7252c8da19c14d22e289fc

mysql-test/mysql-test-run.pl

@@ -2576,7 +2576,7 @@ sub setup_vardir() {
       {
         for (<$bindir/storage/*$opt_vs_config/*.dll>,
              <$bindir/plugin/*$opt_vs_config/*.dll>,
-             <$bindir/libmariadb/plugins/*$opt_vs_config/*.dll>,
+             <$bindir/libmariadb$opt_vs_config/*.dll>,
              <$bindir/sql$opt_vs_config/*.dll>)
         {
           my $pname=basename($_);
@@ -2597,6 +2597,7 @@ sub setup_vardir() {
       for (<$bindir/storage/*/*.so>,
            <$bindir/plugin/*/*.so>,
            <$bindir/libmariadb/plugins/*/*.so>,
+           <$bindir/libmariadb/*.so>,
            <$bindir/sql/*.so>)
       {
         my $pname=basename($_);