Index: CMakeLists.txt
--- CMakeLists.txt.orig	2021-08-06 21:39:27.945479000 +0200
+++ CMakeLists.txt	2021-08-06 21:57:17.316480000 +0200
@@ -448,21 +448,15 @@
 ADD_SUBDIRECTORY(sql/share)
 
 IF(NOT WITHOUT_SERVER)
-  ADD_SUBDIRECTORY(tests)
   ADD_SUBDIRECTORY(sql)
   OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
   IF(WITH_EMBEDDED_SERVER)
     ADD_SUBDIRECTORY(libmysqld)
-    ADD_SUBDIRECTORY(libmysqld/examples)
-    ADD_SUBDIRECTORY(unittest/embedded)
   ENDIF(WITH_EMBEDDED_SERVER)
   IF(NOT WIN32)
     ADD_FEATURE_INFO(EMBEDDED_SERVER WITH_EMBEDDED_SERVER "Embedded MariaDB Server Library")
   ENDIF()
 
-  ADD_SUBDIRECTORY(mysql-test)
-  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-  ADD_SUBDIRECTORY(sql-bench)
   IF(WIN32)
     ADD_SUBDIRECTORY(win/upgrade_wizard)
     ADD_SUBDIRECTORY(win/packaging)
Index: include/CMakeLists.txt
--- include/CMakeLists.txt.orig	2021-08-03 16:48:39.000000000 +0200
+++ include/CMakeLists.txt	2021-08-06 21:39:27.945692000 +0200
@@ -22,6 +22,7 @@
 )
 
 SET(HEADERS 
+  hash.h
   mysql.h 
   mysql_com.h
   mysql_com_server.h
Index: include/my_compare.h
--- include/my_compare.h.orig	2021-08-03 16:48:39.000000000 +0200
+++ include/my_compare.h	2021-08-06 21:39:27.945814000 +0200
@@ -40,7 +40,7 @@
   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
 */
 
-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
 #define HA_MAX_KEY_SEG              32          /* Max segments for key */
 
 #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
Index: include/myisam.h
--- include/myisam.h.orig	2021-08-03 16:48:39.000000000 +0200
+++ include/myisam.h	2021-08-06 21:39:27.945944000 +0200
@@ -45,7 +45,7 @@
   The following defines can be increased if necessary.
   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
 */
-#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
 #define MI_MAX_KEY_SEG              16              /* Max segments for key */
 
 #define MI_NAME_IEXT	".MYI"
Index: include/mysql/service_encryption.h
--- include/mysql/service_encryption.h.orig	2021-08-03 16:48:39.000000000 +0200
+++ include/mysql/service_encryption.h	2021-08-06 21:39:27.946068000 +0200
@@ -37,7 +37,7 @@
 #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 #include <stdlib.h>
 #else
-#include <alloca.h>
+#include <stdlib.h>
 #endif
 #endif
 
Index: libmariadb/mariadb_config/libmariadb.pc.in
--- libmariadb/mariadb_config/libmariadb.pc.in.orig	2021-08-03 16:48:42.000000000 +0200
+++ libmariadb/mariadb_config/libmariadb.pc.in	2021-08-06 21:39:27.946178000 +0200
@@ -13,8 +13,7 @@
 Name: libmariadb
 Version: @CPACK_PACKAGE_VERSION@
 Description: MariaDB Connector/C dynamic library
-Cflags: -I${includedir}
-Libs: -L${libdir} -lmariadb
+Cflags: -pthreads -I${includedir}
+Libs: -pthreads -L${libdir} -lmariadb -lstdc++
 Libs.private: @extra_dynamic_LDFLAGS@
 
-
Index: mysys/CMakeLists.txt
--- mysys/CMakeLists.txt.orig	2021-08-03 16:48:41.000000000 +0200
+++ mysys/CMakeLists.txt	2021-08-06 21:39:27.946301000 +0200
@@ -181,14 +181,3 @@
   TARGET_LINK_LIBRARIES(mysys pthread)
 ENDIF()
 
-ADD_EXECUTABLE(thr_lock thr_lock.c)
-TARGET_LINK_LIBRARIES(thr_lock mysys)
-SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")
-
-ADD_EXECUTABLE(thr_timer thr_timer.c)
-TARGET_LINK_LIBRARIES(thr_timer mysys)
-SET_TARGET_PROPERTIES(thr_timer PROPERTIES COMPILE_FLAGS "-DMAIN")
-
-ADD_EXECUTABLE(test_hash hash.c)
-TARGET_LINK_LIBRARIES(test_hash mysys)
-SET_TARGET_PROPERTIES(test_hash PROPERTIES COMPILE_FLAGS "-DMAIN")
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig	2021-08-03 16:48:41.000000000 +0200
+++ scripts/mysql_config.sh	2021-08-06 21:39:27.946410000 +0200
@@ -86,14 +86,14 @@
 fi
 
 # Create options 
-libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
+libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@ -lstdc++"
 embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
 
 include="-I$pkgincludedir"
 if [ "$basedir" != "/usr" ]; then
   include="$include -I$pkgincludedir/.."
 fi
-cflags="$include @CFLAGS_FOR_CLIENTS@"
+cflags="-pthread $include @CFLAGS_FOR_CLIENTS@"
 
 mariadb_config="$basedir/bin/mariadb_config"
 if test -x "$basedir/bin/mariadb_config"; then
Index: sql/share/CMakeLists.txt
--- sql/share/CMakeLists.txt.orig	2021-08-03 16:48:41.000000000 +0200
+++ sql/share/CMakeLists.txt	2021-08-06 21:39:27.946536000 +0200
@@ -15,30 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335 USA
 
 SET (dirs 
-danish
-german 
-slovak
-dutch
-greek
-norwegian
-spanish
 english
-hungarian
-norwegian-ny
-swedish
-italian
-polish
-ukrainian
-japanese
-portuguese
-romanian
-estonian 
-korean
-russian
-czech
-french
-serbian
-hindi
 )
 
 SET(files 
Index: support-files/mariadb.pc.in
--- support-files/mariadb.pc.in.orig	2021-08-03 16:48:41.000000000 +0200
+++ support-files/mariadb.pc.in	2021-08-06 21:39:27.946642000 +0200
@@ -20,5 +20,5 @@
 Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
 URL: @CPACK_PACKAGE_URL@
 Version: @VERSION@
-Libs: -L${libdir} @LIBS_FOR_CLIENTS@
-Cflags: -I${includedir} @CFLAGS_FOR_CLIENTS@
+Libs: -pthread -L${libdir} @LIBS_FOR_CLIENTS@ -lstdc++
+Cflags: -pthread -I${includedir} @CFLAGS_FOR_CLIENTS@