openpkg-packages/mariadb/mariadb.patch

Index: CMakeLists.txt
--- CMakeLists.txt.orig	2017-08-17 12:05:38.000000000 +0200
+++ CMakeLists.txt	2017-09-01 11:52:12.003598000 +0200
@@ -381,21 +381,16 @@
 ADD_SUBDIRECTORY(sql/share)
 
 IF(NOT WITHOUT_SERVER)
-  ADD_SUBDIRECTORY(tests)
   ADD_SUBDIRECTORY(sql)
   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
   IF(WITH_EMBEDDED_SERVER) 
    ADD_SUBDIRECTORY(libmysqld)
-   ADD_SUBDIRECTORY(libmysqld/examples)
   ENDIF(WITH_EMBEDDED_SERVER)
 
   IF(WITH_WSREP)
     ADD_SUBDIRECTORY(wsrep)
   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	2017-08-17 12:05:38.000000000 +0200
+++ include/CMakeLists.txt	2017-09-01 11:52:12.003745000 +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	2017-08-17 12:05:38.000000000 +0200
+++ include/my_compare.h	2017-09-01 11:52:12.003875000 +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	2017-08-17 12:05:38.000000000 +0200
+++ include/myisam.h	2017-09-01 11:52:12.004029000 +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	2017-08-17 12:05:38.000000000 +0200
+++ include/mysql/service_encryption.h	2017-09-01 11:52:12.004186000 +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	2017-08-17 12:05:38.000000000 +0200
+++ libmariadb/mariadb_config/libmariadb.pc.in	2017-09-01 11:52:12.004314000 +0200
@@ -13,7 +13,7 @@
 Name: libmariadb
 Version: @LIBMARIADB_VERSION@
 Description: MariaDB Connector/C dynamic library
-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
+Cflags: -pthread -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
+Libs: -pthread -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb -lstdc++ @extra_dynamic_LDFLAGS@
 
 
Index: mysys/CMakeLists.txt
--- mysys/CMakeLists.txt.orig	2017-08-17 12:05:39.000000000 +0200
+++ mysys/CMakeLists.txt	2017-09-01 11:52:12.004446000 +0200
@@ -89,18 +89,6 @@
   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")
-
 IF(MSVC)
    INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig	2017-08-17 12:05:39.000000000 +0200
+++ scripts/mysql_config.sh	2017-09-01 11:52:12.004579000 +0200
@@ -105,14 +105,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@"
 
 usage () {
         cat <<EOF
Index: scripts/mysql_install_db.sh
--- scripts/mysql_install_db.sh.orig	2017-08-17 12:05:39.000000000 +0200
+++ scripts/mysql_install_db.sh	2017-09-01 11:52:12.005465000 +0200
@@ -312,17 +312,17 @@
     cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
     exit 1
   fi
-  langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
+  langdir=`find_in_basedir --dir errmsg.sys share/english share/mariadb/english`
   if test -z "$langdir"
   then
-    cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
+    cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mariadb/english
     exit 1
   fi
-  srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
+  srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mariadb`
   buildpkgdatadir=$srcpkgdatadir
   if test -z "$srcpkgdatadir"
   then
-    cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
+    cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mariadb
     exit 1
   fi
   scriptdir="$basedir/scripts"
@@ -377,14 +377,14 @@
 # Check if hostname is valid
 if test "$cross_bootstrap" -eq 0 -a "$in_rpm" -eq 0 -a "$force" -eq 0
 then
-  resolved=`"$extra_bindir/resolveip" $hostname 2>&1`
+  resolved=`"$extra_bindir/mysql_resolveip" $hostname 2>&1`
   if test $? -ne 0
   then
-    resolved=`"$extra_bindir/resolveip" localhost 2>&1`
+    resolved=`"$extra_bindir/mysql_resolveip" localhost 2>&1`
     if test $? -ne 0
     then
       echo "Neither host '$hostname' nor 'localhost' could be looked up with"
-      echo "'$extra_bindir/resolveip'"
+      echo "'$extra_bindir/mysql_resolveip'"
       echo "Please configure the 'hostname' command to return a correct"
       echo "hostname."
       echo "If you want to solve this at a later stage, restart this script"
Index: sql/CMakeLists.txt
--- sql/CMakeLists.txt.orig	2017-08-17 12:05:40.000000000 +0200
+++ sql/CMakeLists.txt	2017-09-01 11:52:12.004873000 +0200
@@ -388,10 +388,6 @@
 
 IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
 
-# Copy db.opt into data/test/
-SET(DBOPT_FILE ${CMAKE_SOURCE_DIR}/support-files/db.opt ) 
-INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-
 # Install initial database on windows
 IF(NOT CMAKE_CROSSCOMPILING)
   GET_TARGET_PROPERTY(MYSQLD_EXECUTABLE mysqld LOCATION)
Index: sql/share/CMakeLists.txt
--- sql/share/CMakeLists.txt.orig	2017-09-01 11:52:12.005058000 +0200
+++ sql/share/CMakeLists.txt	2017-09-01 12:11:50.627041000 +0200
@@ -15,30 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 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	2017-08-17 12:05:42.000000000 +0200
+++ support-files/mariadb.pc.in	2017-09-01 11:52:12.005289000 +0200
@@ -19,5 +19,5 @@
 Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
 URL: @CPACK_PACKAGE_URL@
 Version: @VERSION@
-Libs: -L${libdir} @LIBS_FOR_CLIENTS@
-Cflags: -I${includedir} -I${includedir}/.. @CFLAGS_FOR_CLIENTS@
+Libs: -pthread -L${libdir} @LIBS_FOR_CLIENTS@ -lstdc++
+Cflags: -pthread -I${includedir} -I${includedir}/.. @CFLAGS_FOR_CLIENTS@