|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: CMakeLists.txt
|
|
|
|
|
--- CMakeLists.txt.orig 2019-07-30 13:32:14.000000000 +0200
|
|
|
|
|
+++ CMakeLists.txt 2019-08-10 11:03:34.371079000 +0200
|
|
|
|
|
@@ -424,22 +424,16 @@
|
|
|
|
|
--- CMakeLists.txt.orig 2019-09-11 19:40:59.349952000 +0200
|
|
|
|
|
+++ CMakeLists.txt 2019-09-11 20:17:31.836678000 +0200
|
|
|
|
|
@@ -417,18 +417,12 @@
|
|
|
|
|
ADD_SUBDIRECTORY(sql/share)
|
|
|
|
|
|
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
|
|
@ -14,10 +14,6 @@ Index: CMakeLists.txt
|
|
|
|
|
- ADD_SUBDIRECTORY(unittest/embedded)
|
|
|
|
|
ENDIF(WITH_EMBEDDED_SERVER)
|
|
|
|
|
|
|
|
|
|
IF(WITH_WSREP)
|
|
|
|
|
ADD_SUBDIRECTORY(wsrep-lib)
|
|
|
|
|
ENDIF()
|
|
|
|
|
|
|
|
|
|
- ADD_SUBDIRECTORY(mysql-test)
|
|
|
|
|
- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
|
|
|
|
|
- ADD_SUBDIRECTORY(sql-bench)
|
|
|
|
@ -25,8 +21,8 @@ Index: CMakeLists.txt
|
|
|
|
|
ADD_SUBDIRECTORY(win/upgrade_wizard)
|
|
|
|
|
ADD_SUBDIRECTORY(win/packaging)
|
|
|
|
|
Index: include/CMakeLists.txt
|
|
|
|
|
--- include/CMakeLists.txt.orig 2019-07-30 13:32:14.000000000 +0200
|
|
|
|
|
+++ include/CMakeLists.txt 2019-08-10 11:03:34.371231000 +0200
|
|
|
|
|
--- include/CMakeLists.txt.orig 2019-09-08 23:02:29.000000000 +0200
|
|
|
|
|
+++ include/CMakeLists.txt 2019-09-11 19:40:59.350179000 +0200
|
|
|
|
|
@@ -22,6 +22,7 @@
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
@ -36,8 +32,8 @@ Index: include/CMakeLists.txt
|
|
|
|
|
mysql_com.h
|
|
|
|
|
mysql_com_server.h
|
|
|
|
|
Index: include/my_compare.h
|
|
|
|
|
--- include/my_compare.h.orig 2019-07-30 13:32:14.000000000 +0200
|
|
|
|
|
+++ include/my_compare.h 2019-08-10 11:03:34.371367000 +0200
|
|
|
|
|
--- include/my_compare.h.orig 2019-09-08 23:02:29.000000000 +0200
|
|
|
|
|
+++ include/my_compare.h 2019-09-11 19:40:59.350311000 +0200
|
|
|
|
|
@@ -40,7 +40,7 @@
|
|
|
|
|
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
|
|
|
|
|
*/
|
|
|
|
@ -48,8 +44,8 @@ Index: include/my_compare.h
|
|
|
|
|
|
|
|
|
|
#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
|
|
|
|
|
Index: include/myisam.h
|
|
|
|
|
--- include/myisam.h.orig 2019-07-30 13:32:14.000000000 +0200
|
|
|
|
|
+++ include/myisam.h 2019-08-10 11:03:34.371517000 +0200
|
|
|
|
|
--- include/myisam.h.orig 2019-09-08 23:02:29.000000000 +0200
|
|
|
|
|
+++ include/myisam.h 2019-09-11 19:40:59.350457000 +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.
|
|
|
|
@ -60,8 +56,8 @@ Index: include/myisam.h
|
|
|
|
|
|
|
|
|
|
#define MI_NAME_IEXT ".MYI"
|
|
|
|
|
Index: include/mysql/service_encryption.h
|
|
|
|
|
--- include/mysql/service_encryption.h.orig 2019-07-30 13:32:14.000000000 +0200
|
|
|
|
|
+++ include/mysql/service_encryption.h 2019-08-10 11:03:34.371659000 +0200
|
|
|
|
|
--- include/mysql/service_encryption.h.orig 2019-09-08 23:02:29.000000000 +0200
|
|
|
|
|
+++ include/mysql/service_encryption.h 2019-09-11 19:40:59.350590000 +0200
|
|
|
|
|
@@ -37,7 +37,7 @@
|
|
|
|
|
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
@ -72,8 +68,8 @@ Index: include/mysql/service_encryption.h
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
Index: libmariadb/mariadb_config/libmariadb.pc.in
|
|
|
|
|
--- libmariadb/mariadb_config/libmariadb.pc.in.orig 2019-08-10 11:03:34.371829000 +0200
|
|
|
|
|
+++ libmariadb/mariadb_config/libmariadb.pc.in 2019-08-10 11:04:18.162783000 +0200
|
|
|
|
|
--- libmariadb/mariadb_config/libmariadb.pc.in.orig 2019-09-08 23:02:30.000000000 +0200
|
|
|
|
|
+++ libmariadb/mariadb_config/libmariadb.pc.in 2019-09-11 19:40:59.350729000 +0200
|
|
|
|
|
@@ -13,8 +13,7 @@
|
|
|
|
|
Name: libmariadb
|
|
|
|
|
Version: @CPACK_PACKAGE_VERSION@
|
|
|
|
@ -86,8 +82,8 @@ Index: libmariadb/mariadb_config/libmariadb.pc.in
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
Index: mysys/CMakeLists.txt
|
|
|
|
|
--- mysys/CMakeLists.txt.orig 2019-07-30 13:32:15.000000000 +0200
|
|
|
|
|
+++ mysys/CMakeLists.txt 2019-08-10 11:03:34.372023000 +0200
|
|
|
|
|
--- mysys/CMakeLists.txt.orig 2019-09-08 23:02:31.000000000 +0200
|
|
|
|
|
+++ mysys/CMakeLists.txt 2019-09-11 19:40:59.350862000 +0200
|
|
|
|
|
@@ -85,18 +85,6 @@
|
|
|
|
|
TARGET_LINK_LIBRARIES(mysys pthread)
|
|
|
|
|
ENDIF()
|
|
|
|
@ -108,8 +104,8 @@ Index: mysys/CMakeLists.txt
|
|
|
|
|
INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
|
|
|
|
|
ENDIF()
|
|
|
|
|
Index: scripts/mysql_config.sh
|
|
|
|
|
--- scripts/mysql_config.sh.orig 2019-07-30 13:32:16.000000000 +0200
|
|
|
|
|
+++ scripts/mysql_config.sh 2019-08-10 11:03:34.372140000 +0200
|
|
|
|
|
--- scripts/mysql_config.sh.orig 2019-09-08 23:02:31.000000000 +0200
|
|
|
|
|
+++ scripts/mysql_config.sh 2019-09-11 19:40:59.350981000 +0200
|
|
|
|
|
@@ -86,14 +86,14 @@
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
@ -128,8 +124,8 @@ Index: scripts/mysql_config.sh
|
|
|
|
|
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 2019-07-30 13:32:16.000000000 +0200
|
|
|
|
|
+++ scripts/mysql_install_db.sh 2019-08-10 11:03:34.372317000 +0200
|
|
|
|
|
--- scripts/mysql_install_db.sh.orig 2019-09-08 23:02:31.000000000 +0200
|
|
|
|
|
+++ scripts/mysql_install_db.sh 2019-09-11 19:40:59.351149000 +0200
|
|
|
|
|
@@ -374,7 +374,7 @@
|
|
|
|
|
else
|
|
|
|
|
basedir="@prefix@"
|
|
|
|
@ -140,8 +136,8 @@ Index: scripts/mysql_install_db.sh
|
|
|
|
|
srcpkgdatadir="@pkgdatadir@"
|
|
|
|
|
buildpkgdatadir="@pkgdatadir@"
|
|
|
|
|
Index: sql/CMakeLists.txt
|
|
|
|
|
--- sql/CMakeLists.txt.orig 2019-07-30 13:32:16.000000000 +0200
|
|
|
|
|
+++ sql/CMakeLists.txt 2019-08-10 11:03:34.372475000 +0200
|
|
|
|
|
--- sql/CMakeLists.txt.orig 2019-09-08 23:02:31.000000000 +0200
|
|
|
|
|
+++ sql/CMakeLists.txt 2019-09-11 19:40:59.351303000 +0200
|
|
|
|
|
@@ -425,10 +425,6 @@
|
|
|
|
|
|
|
|
|
|
IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
|
|
|
|
@ -154,8 +150,8 @@ Index: sql/CMakeLists.txt
|
|
|
|
|
IF(WIN32 AND TARGET mysqld AND NOT CMAKE_CROSSCOMPILING)
|
|
|
|
|
|
|
|
|
|
Index: sql/share/CMakeLists.txt
|
|
|
|
|
--- sql/share/CMakeLists.txt.orig 2019-07-30 13:32:16.000000000 +0200
|
|
|
|
|
+++ sql/share/CMakeLists.txt 2019-08-10 11:03:34.372604000 +0200
|
|
|
|
|
--- sql/share/CMakeLists.txt.orig 2019-09-08 23:02:32.000000000 +0200
|
|
|
|
|
+++ sql/share/CMakeLists.txt 2019-09-11 19:40:59.351433000 +0200
|
|
|
|
|
@@ -15,30 +15,7 @@
|
|
|
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
|
|
|
|
|
|
|
|
|
@ -188,8 +184,8 @@ Index: sql/share/CMakeLists.txt
|
|
|
|
|
|
|
|
|
|
SET(files
|
|
|
|
|
Index: support-files/mariadb.pc.in
|
|
|
|
|
--- support-files/mariadb.pc.in.orig 2019-07-30 13:32:17.000000000 +0200
|
|
|
|
|
+++ support-files/mariadb.pc.in 2019-08-10 11:03:34.372711000 +0200
|
|
|
|
|
--- support-files/mariadb.pc.in.orig 2019-09-08 23:02:34.000000000 +0200
|
|
|
|
|
+++ support-files/mariadb.pc.in 2019-09-11 19:40:59.351538000 +0200
|
|
|
|
|
@@ -19,5 +19,5 @@
|
|
|
|
|
Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
|
|
|
|
|
URL: @CPACK_PACKAGE_URL@
|
|
|
|
|