You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
198 lines
6.5 KiB
198 lines
6.5 KiB
Index: CMakeLists.txt |
|
--- CMakeLists.txt.orig 2017-10-30 09:10:42.000000000 +0100 |
|
+++ CMakeLists.txt 2017-11-01 12:25:24.436195000 +0100 |
|
@@ -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-10-30 09:10:43.000000000 +0100 |
|
+++ include/CMakeLists.txt 2017-11-01 12:25:24.436407000 +0100 |
|
@@ -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-10-30 09:10:43.000000000 +0100 |
|
+++ include/my_compare.h 2017-11-01 12:25:24.436597000 +0100 |
|
@@ -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-10-30 09:10:43.000000000 +0100 |
|
+++ include/myisam.h 2017-11-01 12:25:24.436820000 +0100 |
|
@@ -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-10-30 09:10:43.000000000 +0100 |
|
+++ include/mysql/service_encryption.h 2017-11-01 12:25:24.437015000 +0100 |
|
@@ -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-10-30 09:10:43.000000000 +0100 |
|
+++ libmariadb/mariadb_config/libmariadb.pc.in 2017-11-01 12:25:24.437212000 +0100 |
|
@@ -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-10-30 09:10:45.000000000 +0100 |
|
+++ mysys/CMakeLists.txt 2017-11-01 12:25:24.437408000 +0100 |
|
@@ -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-10-30 09:10:45.000000000 +0100 |
|
+++ scripts/mysql_config.sh 2017-11-01 12:25:24.437625000 +0100 |
|
@@ -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@" |
|
|
|
mariadb_config="$basedir/bin/mariadb_config" |
|
if test -x "$basedir/bin/mariadb_config"; then |
|
Index: scripts/mysql_install_db.sh |
|
--- scripts/mysql_install_db.sh.orig 2017-11-01 12:25:24.437991000 +0100 |
|
+++ scripts/mysql_install_db.sh 2017-11-01 12:26:44.939091000 +0100 |
|
@@ -332,7 +332,7 @@ |
|
else |
|
basedir="@prefix@" |
|
bindir="@bindir@" |
|
- resolveip="$bindir/resolveip" |
|
+ resolveip="$bindir/mysql_resolveip" |
|
mysqld="@libexecdir@/mysqld" |
|
srcpkgdatadir="@pkgdatadir@" |
|
buildpkgdatadir="@pkgdatadir@" |
|
Index: sql/CMakeLists.txt |
|
--- sql/CMakeLists.txt.orig 2017-10-30 09:10:45.000000000 +0100 |
|
+++ sql/CMakeLists.txt 2017-11-01 12:25:24.438860000 +0100 |
|
@@ -398,10 +398,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-10-30 09:10:45.000000000 +0100 |
|
+++ sql/share/CMakeLists.txt 2017-11-01 12:25:24.439096000 +0100 |
|
@@ -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-10-30 09:10:49.000000000 +0100 |
|
+++ support-files/mariadb.pc.in 2017-11-01 12:25:24.439286000 +0100 |
|
@@ -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@
|
|
|