diff options
39 files changed, 168 insertions, 571 deletions
diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile index c047b2bda322..015bbc3ce1f4 100644 --- a/databases/mariadb55-client/Makefile +++ b/databases/mariadb55-client/Makefile @@ -19,9 +19,11 @@ CONFLICTS_INSTALL= mariadb5[0-46-9]-client-* \ percona*-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 -USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes +USES+= ncurses readline + + post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt index ded5ff508152..5135eaf3f489 100644 --- a/databases/mariadb55-client/files/patch-CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2017-04-11 22:03:13.000000000 +0200 -+++ CMakeLists.txt 2017-04-18 10:11:38.582817000 +0200 +--- CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ CMakeLists.txt @@ -393,28 +393,8 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) diff --git a/databases/mariadb55-client/files/patch-MDEV-12230 b/databases/mariadb55-client/files/patch-MDEV-12230 deleted file mode 100644 index 1a7b2b48347f..000000000000 --- a/databases/mariadb55-client/files/patch-MDEV-12230 +++ /dev/null @@ -1,205 +0,0 @@ -From 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 Mon Sep 17 00:00:00 2001 -From: Sergei Golubchik <serg@mariadb.org> -Date: Tue, 18 Apr 2017 12:35:05 +0200 -Subject: [PATCH] =?UTF-8?q?MDEV-12230=20include/my=5Fsys.h:600:43:=20error?= - =?UTF-8?q?:=20unknown=20type=20name=20=E2=80=98PSI=5Ffile=5Fkey=E2=80=99"?= - =?UTF-8?q?=20when=20-DWITHOUT=5FSERVER=3D1?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -cherry-pick 2c2bd8c155 (MDEV-12261 build failure without P_S) from 10.0 ---- - include/my_sys.h | 3 +-- - include/mysql/psi/mysql_file.h | 47 ++++++++++++++++++++++++++++++++++++++++ - mysys/my_symlink2.c | 14 +++++------- - sql/handler.cc | 2 +- - sql/sql_db.cc | 4 ++-- - storage/maria/ma_delete_table.c | 4 ++-- - storage/myisam/mi_delete_table.c | 4 ++-- - 7 files changed, 61 insertions(+), 17 deletions(-) - -diff --git a/include/my_sys.h b/include/my_sys.h -index 10551e1..2794068 100644 ---- include/my_sys.h.orig -+++ include/my_sys.h -@@ -580,8 +580,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename, - myf MyFlags); - extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags); - extern int my_symlink(const char *content, const char *linkname, myf MyFlags); --extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name, -- const char *ext, myf sync_dir); -+extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir); - - extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags); - extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset, -diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h -index 4a0f3fd..aa3ed7e 100644 ---- include/mysql/psi/mysql_file.h.orig -+++ include/mysql/psi/mysql_file.h -@@ -435,6 +435,20 @@ - #endif - - /** -+ @def mysql_file_delete_with_symlink(K, P1, P2, P3) -+ Instrumented delete with symbolic link. -+ @c mysql_file_delete_with_symlink is a replacement -+ for @c my_handler_delete_with_symlink. -+*/ -+#ifdef HAVE_PSI_INTERFACE -+ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ -+ inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3) -+#else -+ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ -+ inline_mysql_file_delete_with_symlink(P1, P2, P3) -+#endif -+ -+/** - @def mysql_file_rename_with_symlink(K, P1, P2, P3) - Instrumented rename with symbolic link. - @c mysql_file_rename_with_symlink is a replacement -@@ -1305,6 +1319,7 @@ inline_mysql_file_rename( - return result; - } - -+ - static inline File - inline_mysql_file_create_with_symlink( - #ifdef HAVE_PSI_INTERFACE -@@ -1335,6 +1350,38 @@ inline_mysql_file_create_with_symlink( - } - - static inline int -+inline_mysql_file_delete_with_symlink( -+#ifdef HAVE_PSI_INTERFACE -+ PSI_file_key key, const char *src_file, uint src_line, -+#endif -+ const char *name, const char *ext, myf flags) -+{ -+ int result; -+ char fullname[FN_REFLEN]; -+#ifdef HAVE_PSI_INTERFACE -+ struct PSI_file_locker *locker= NULL; -+ PSI_file_locker_state state; -+#endif -+ fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); -+#ifdef HAVE_PSI_INTERFACE -+ if (likely(PSI_server != NULL)) -+ { -+ locker= PSI_server->get_thread_file_name_locker(&state, key, PSI_FILE_DELETE, -+ fullname, &locker); -+ if (likely(locker != NULL)) -+ PSI_server->start_file_wait(locker, (size_t) 0, src_file, src_line); -+ } -+#endif -+ result= my_handler_delete_with_symlink(fullname, flags); -+#ifdef HAVE_PSI_INTERFACE -+ if (likely(locker != NULL)) -+ PSI_server->end_file_wait(locker, (size_t) 0); -+#endif -+ return result; -+} -+ -+ -+static inline int - inline_mysql_file_rename_with_symlink( - #ifdef HAVE_PSI_INTERFACE - PSI_file_key key, const char *src_file, uint src_line, -diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c -index 5fe7b8f..c851468 100644 ---- mysys/my_symlink2.c.orig -+++ mysys/my_symlink2.c -@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) - in this case both the symlink and the symlinked file are deleted, - but only if the symlinked file is not in the datadir. - */ --int my_handler_delete_with_symlink(PSI_file_key key, const char *name, -- const char *ext, myf sync_dir) -+int my_handler_delete_with_symlink(const char *filename, myf sync_dir) - { -- char orig[FN_REFLEN], real[FN_REFLEN]; -+ char real[FN_REFLEN]; - int res= 0; - DBUG_ENTER("my_handler_delete_with_symlink"); - -- fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); -- if (my_is_symlink(orig)) -+ if (my_is_symlink(filename)) - { - /* - Delete the symlinked file only if the symlink is not - pointing into datadir. - */ -- if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) -- res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | MY_WME | sync_dir)); -+ if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) -+ res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); - } -- DBUG_RETURN(mysql_file_delete(key, orig, MYF(MY_WME | sync_dir)) || res); -+ DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); - } -diff --git a/sql/handler.cc b/sql/handler.cc -index 2ae144a..dc40e34 100644 ---- sql/handler.cc.orig -+++ sql/handler.cc -@@ -3381,7 +3381,7 @@ int handler::delete_table(const char *name) - - for (const char **ext=bas_ext(); *ext ; ext++) - { -- if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) -+ if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) - { - if (my_errno != ENOENT) - { -diff --git a/sql/sql_db.cc b/sql/sql_db.cc -index 7bb4f0f..580590b 100644 ---- sql/sql_db.cc.orig -+++ sql/sql_db.cc -@@ -1085,7 +1085,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, - We ignore ENOENT error in order to skip files that was deleted - by concurrently running statement like REPAIR TABLE ... - */ -- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && -+ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && - my_errno != ENOENT) - { - my_error(EE_DELETE, MYF(0), filePath, my_errno); -@@ -1206,7 +1206,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) - continue; - } - strxmov(filePath, org_path, "/", file->name, NullS); -- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) -+ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) - { - goto err; - } -diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c -index c4bcd5b..f80ec13 100644 ---- storage/maria/ma_delete_table.c.orig -+++ storage/maria/ma_delete_table.c -@@ -86,8 +86,8 @@ int maria_delete_table_files(const char *name, myf sync_dir) - { - DBUG_ENTER("maria_delete_table_files"); - -- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || -- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) -+ if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || -+ mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) - DBUG_RETURN(my_errno); - DBUG_RETURN(0); - } -diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c -index ebedfbd..ca395ff 100644 ---- storage/myisam/mi_delete_table.c.orig -+++ storage/myisam/mi_delete_table.c -@@ -28,8 +28,8 @@ int mi_delete_table(const char *name) - check_table_is_closed(name,"delete"); - #endif - -- if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || -- my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) -+ if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || -+ mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) - DBUG_RETURN(my_errno); - DBUG_RETURN(0); - } diff --git a/databases/mariadb55-client/files/patch-client_CMakeLists.txt b/databases/mariadb55-client/files/patch-client_CMakeLists.txt index 2a96c82473a8..25484091f9ba 100644 --- a/databases/mariadb55-client/files/patch-client_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-client_CMakeLists.txt @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ client/CMakeLists.txt 2013-01-05 01:49:16.000000000 +0200 -@@ -34,11 +34,12 @@ +--- client/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ client/CMakeLists.txt +@@ -34,11 +34,12 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -14,8 +14,8 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -49,15 +50,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +@@ -50,15 +51,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +IF(FALSE) @@ -34,7 +34,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -75,10 +80,12 @@ +@@ -76,10 +81,12 @@ IF(WIN32) ENDIF(WIN32) # async_example is just a code example, do not install it. diff --git a/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake b/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake index 2b32419de733..f075ff3b7990 100644 --- a/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake +++ b/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake @@ -1,6 +1,6 @@ ---- cmake/jemalloc.cmake.orig 2014-10-08 15:19:51.000000000 +0200 -+++ cmake/jemalloc.cmake 2014-11-16 20:27:50.032638191 +0100 -@@ -22,11 +22,11 @@ +--- cmake/jemalloc.cmake.orig 2017-04-30 11:09:29 UTC ++++ cmake/jemalloc.cmake +@@ -22,11 +22,11 @@ MACRO (CHECK_JEMALLOC) SET(libname jemalloc) ENDIF() diff --git a/databases/mariadb55-client/files/patch-extra_CMakeLists.txt b/databases/mariadb55-client/files/patch-extra_CMakeLists.txt index f08649d6ed04..ff7938f19948 100644 --- a/databases/mariadb55-client/files/patch-extra_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-extra_CMakeLists.txt @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2012-12-17 03:38:29.000000000 +0200 -+++ extra/CMakeLists.txt 2012-12-17 03:40:12.000000000 +0200 -@@ -54,6 +54,7 @@ +--- extra/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ extra/CMakeLists.txt +@@ -54,6 +54,7 @@ ADD_CUSTOM_TARGET(GenError DEPENDS ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys) -@@ -74,11 +75,14 @@ +@@ -74,11 +75,14 @@ ENDIF() MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) TARGET_LINK_LIBRARIES(replace mysys) diff --git a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp index 214edfd8834a..67c12b4e8112 100644 --- a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -1,6 +1,6 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 -+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 -@@ -75,7 +75,7 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2017-04-30 11:09:29 UTC ++++ extra/yassl/taocrypt/src/integer.cpp +@@ -74,7 +74,7 @@ template <class T> CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( size_type n, const void *) { diff --git a/databases/mariadb55-client/files/patch-include_CMakeLists.txt b/databases/mariadb55-client/files/patch-include_CMakeLists.txt index e4c1761275ca..57c37be4426c 100644 --- a/databases/mariadb55-client/files/patch-include_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-include_CMakeLists.txt @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200 -@@ -58,13 +58,18 @@ +--- include/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ include/CMakeLists.txt +@@ -59,16 +59,21 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I FOREACH(f ${HEADERS_GEN_CONFIGURE}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) ENDFOREACH(f) @@ -20,3 +20,6 @@ PATTERN mysql EXCLUDE REGEX "\\./(${EXCL_RE}$)" EXCLUDE) +ENDIF() + + INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" diff --git a/databases/mariadb55-server/files/extra-patch-include_my_compare.h b/databases/mariadb55-client/files/patch-include_my__compare.h index 5fc447b98cd7..0d9945b156c2 100644 --- a/databases/mariadb55-server/files/extra-patch-include_my_compare.h +++ b/databases/mariadb55-client/files/patch-include_my__compare.h @@ -1,6 +1,6 @@ ---- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 -+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 -@@ -40,7 +40,7 @@ +--- include/my_compare.h.orig 2017-04-30 11:09:29 UTC ++++ include/my_compare.h +@@ -40,7 +40,7 @@ extern "C" { But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. */ diff --git a/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt index c80c4c6e12f9..415787052dfa 100644 --- a/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libservices/CMakeLists.txt.orig 2014-10-08 15:19:52.000000000 +0200 -+++ libservices/CMakeLists.txt 2014-10-17 21:47:48.000000000 +0200 -@@ -26,4 +26,6 @@ +--- libservices/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ libservices/CMakeLists.txt +@@ -26,4 +26,6 @@ SET(MYSQLSERVICES_SOURCES logger_service.c) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) diff --git a/databases/mariadb55-client/files/patch-man_CMakeLists.txt b/databases/mariadb55-client/files/patch-man_CMakeLists.txt index 09dd6e3b0f7d..df40cfa389f7 100644 --- a/databases/mariadb55-client/files/patch-man_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-man_CMakeLists.txt @@ -1,6 +1,6 @@ ---- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200 -+++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200 -@@ -30,9 +30,13 @@ +--- man/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ man/CMakeLists.txt +@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1) SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 mysqltest_embedded.1 mysql_client_test_embedded.1) diff --git a/databases/mariadb55-client/files/patch-mysys_default.c b/databases/mariadb55-client/files/patch-mysys_default.c index d99332492a41..e36841601a62 100644 --- a/databases/mariadb55-client/files/patch-mysys_default.c +++ b/databases/mariadb55-client/files/patch-mysys_default.c @@ -1,6 +1,6 @@ ---- mysys/default.c.orig 2013-10-01 21:15:03.544135869 +0200 -+++ mysys/default.c 2013-10-01 21:15:38.871375504 +0200 -@@ -89,7 +89,7 @@ +--- mysys/default.c.orig 2017-04-30 11:09:31 UTC ++++ mysys/default.c +@@ -89,7 +89,7 @@ static my_bool defaults_already_read= FA /* Which directories are searched for options (and in which order) */ @@ -9,7 +9,7 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -785,7 +785,7 @@ +@@ -786,7 +786,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -18,7 +18,7 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ +@@ -804,6 +804,14 @@ static int search_default_file_with_ext( if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) return 1; /* Ignore wrong files */ @@ -33,7 +33,7 @@ while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; -@@ -1067,7 +1067,8 @@ +@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ *end++= '.'; strxmov(end, conf_file, *ext, " ", NullS); @@ -43,7 +43,7 @@ } } } -@@ -1226,10 +1226,8 @@ +@@ -1227,10 +1236,8 @@ static const char **init_default_directo errors += add_directory(alloc, "/etc/", dirs); errors += add_directory(alloc, "/etc/mysql/", dirs); diff --git a/databases/mariadb55-client/files/patch-regex_CMakeLists.txt b/databases/mariadb55-client/files/patch-regex_CMakeLists.txt index a058662b781b..ab79c3bf56c0 100644 --- a/databases/mariadb55-client/files/patch-regex_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-regex_CMakeLists.txt @@ -1,6 +1,6 @@ ---- regex/CMakeLists.txt.orig 2012-12-23 00:42:41.000000000 +0200 -+++ regex/CMakeLists.txt 2012-12-23 00:42:54.000000000 +0200 -@@ -18,4 +18,6 @@ +--- regex/CMakeLists.txt.orig 2017-04-30 11:09:31 UTC ++++ regex/CMakeLists.txt +@@ -18,4 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c) ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES}) diff --git a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt index cf8b85b1b20a..ea769d7f3d2d 100644 --- a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2014-04-15 14:02:28.000000000 +0300 -+++ scripts/CMakeLists.txt 2014-05-16 19:02:48.000000000 +0300 -@@ -72,6 +72,7 @@ +--- scripts/CMakeLists.txt.orig 2017-04-30 11:09:31 UTC ++++ scripts/CMakeLists.txt +@@ -72,6 +72,7 @@ IF(UNIX) ) ENDIF() @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -81,6 +82,7 @@ +@@ -81,6 +82,7 @@ INSTALL(FILES ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -140,6 +142,7 @@ +@@ -133,6 +135,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -180,6 +183,7 @@ +@@ -173,6 +176,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -204,6 +208,7 @@ +@@ -197,6 +201,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,7 +40,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -219,6 +224,7 @@ +@@ -212,6 +217,7 @@ INSTALL_SCRIPT( COMPONENT Server ) ENDIF() @@ -48,7 +48,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") SET(sysconfdir ${prefix}) -@@ -276,6 +282,8 @@ +@@ -270,6 +276,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) ENDIF() @@ -57,7 +57,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -334,18 +342,8 @@ +@@ -328,18 +336,8 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config diff --git a/databases/mariadb55-server/files/patch-scripts_mysql_config.sh b/databases/mariadb55-client/files/patch-scripts_mysql__config.sh index 5271d5256b8f..8788844b5670 100644 --- a/databases/mariadb55-server/files/patch-scripts_mysql_config.sh +++ b/databases/mariadb55-client/files/patch-scripts_mysql__config.sh @@ -1,6 +1,6 @@ ---- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 -+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 -@@ -108,8 +108,11 @@ +--- scripts/mysql_config.sh.orig 2017-04-30 11:09:31 UTC ++++ scripts/mysql_config.sh +@@ -109,8 +109,11 @@ fi # We intentionally add a space to the beginning and end of lib strings, simplifies replace later libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " diff --git a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt index 08a6556bbbb2..90098d933cbe 100644 --- a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200 -+++ support-files/CMakeLists.txt 2014-10-17 22:34:28.000000000 +0200 -@@ -41,15 +41,18 @@ +--- support-files/CMakeLists.txt.orig 2017-04-30 11:09:34 UTC ++++ support-files/CMakeLists.txt +@@ -41,15 +41,18 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -19,9 +19,9 @@ FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -69,8 +72,10 @@ +@@ -69,8 +72,10 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) + ADD_SUBDIRECTORY(SELinux) ENDIF() + ENDIF() @@ -30,7 +30,7 @@ CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) -@@ -94,6 +99,7 @@ +@@ -94,6 +99,7 @@ IF(UNIX) DESTINATION ${inst_location} COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 010212a3dcff..78c7e5a9fe3c 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.55 +PORTVERSION= 5.5.56 PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ @@ -25,6 +25,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client USES= cmake execinfo shebangfix ssl +USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh sql-bench/[a-km-z]* CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ @@ -58,9 +59,18 @@ BROKEN_sparc64= Does not compile: Unsupported platform .error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif +OPTIONS_DEFINE+= FASTMTX +OPTIONS_SUB= yes +NO_OPTIONS_SORT= yes + +FASTMTX_DESC= Replace mutexes with spinlocks + +FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 + .if !defined(CLIENT_ONLY) # MySQL-Server part USES+= mysql:55m +USE_LDCONFIG|= ${PREFIX}/lib/mysql/plugin CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \ mariadb1*-server-* \ @@ -76,20 +86,6 @@ CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=/usr/include \ -DWITH_EMBEDDED_SERVER="ON" \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -.else -# MySQL-Client part -USES+= ncurses readline -.endif - -OPTIONS_DEFINE+= FASTMTX -OPTIONS_SUB= yes -NO_OPTIONS_SORT=yes - -FASTMTX_DESC= Replace mutexes with spinlocks - -FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 - -.if !defined(CLIENT_ONLY) # MySQL-Server options OPTIONS_DEFINE+= MAXKEY OQGRAPH OPTIONS_DEFAULT+= MAXKEY @@ -102,7 +98,7 @@ OQGRAPH_USE= GCC=yes OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs OQGRAPH_BROKEN= OQGraph does not build -MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-include_my_compare.h +MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-include_my__compare.h .endif .include <bsd.port.pre.mk> diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo index acc88dc46f19..e721b61d23fd 100644 --- a/databases/mariadb55-server/distinfo +++ b/databases/mariadb55-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492502977 -SHA256 (mariadb-5.5.55.tar.gz) = cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86 -SIZE (mariadb-5.5.55.tar.gz) = 45757922 +TIMESTAMP = 1493881178 +SHA256 (mariadb-5.5.56.tar.gz) = 950c3422cb262b16ce133caadbc342219f50f9b45dcc71b8db78fc376a971726 +SIZE (mariadb-5.5.56.tar.gz) = 45777456 diff --git a/databases/mariadb55-client/files/patch-include_my_compare.h b/databases/mariadb55-server/files/extra-patch-include_my__compare.h index ad948aa1b5db..0d9945b156c2 100644 --- a/databases/mariadb55-client/files/patch-include_my_compare.h +++ b/databases/mariadb55-server/files/extra-patch-include_my__compare.h @@ -1,6 +1,6 @@ ---- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200 -+++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200 -@@ -40,7 +40,7 @@ +--- include/my_compare.h.orig 2017-04-30 11:09:29 UTC ++++ include/my_compare.h +@@ -40,7 +40,7 @@ extern "C" { But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. */ diff --git a/databases/mariadb55-server/files/patch-CMakeLists.txt b/databases/mariadb55-server/files/patch-CMakeLists.txt index 45eb8c736289..0e087b5ed4db 100644 --- a/databases/mariadb55-server/files/patch-CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2017-04-11 20:03:13 UTC +--- CMakeLists.txt.orig 2017-04-30 11:09:29 UTC +++ CMakeLists.txt @@ -397,22 +397,22 @@ ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(support-files) diff --git a/databases/mariadb55-server/files/patch-MDEV-12230 b/databases/mariadb55-server/files/patch-MDEV-12230 deleted file mode 100644 index 1a7b2b48347f..000000000000 --- a/databases/mariadb55-server/files/patch-MDEV-12230 +++ /dev/null @@ -1,205 +0,0 @@ -From 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 Mon Sep 17 00:00:00 2001 -From: Sergei Golubchik <serg@mariadb.org> -Date: Tue, 18 Apr 2017 12:35:05 +0200 -Subject: [PATCH] =?UTF-8?q?MDEV-12230=20include/my=5Fsys.h:600:43:=20error?= - =?UTF-8?q?:=20unknown=20type=20name=20=E2=80=98PSI=5Ffile=5Fkey=E2=80=99"?= - =?UTF-8?q?=20when=20-DWITHOUT=5FSERVER=3D1?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -cherry-pick 2c2bd8c155 (MDEV-12261 build failure without P_S) from 10.0 ---- - include/my_sys.h | 3 +-- - include/mysql/psi/mysql_file.h | 47 ++++++++++++++++++++++++++++++++++++++++ - mysys/my_symlink2.c | 14 +++++------- - sql/handler.cc | 2 +- - sql/sql_db.cc | 4 ++-- - storage/maria/ma_delete_table.c | 4 ++-- - storage/myisam/mi_delete_table.c | 4 ++-- - 7 files changed, 61 insertions(+), 17 deletions(-) - -diff --git a/include/my_sys.h b/include/my_sys.h -index 10551e1..2794068 100644 ---- include/my_sys.h.orig -+++ include/my_sys.h -@@ -580,8 +580,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename, - myf MyFlags); - extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags); - extern int my_symlink(const char *content, const char *linkname, myf MyFlags); --extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name, -- const char *ext, myf sync_dir); -+extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir); - - extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags); - extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset, -diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h -index 4a0f3fd..aa3ed7e 100644 ---- include/mysql/psi/mysql_file.h.orig -+++ include/mysql/psi/mysql_file.h -@@ -435,6 +435,20 @@ - #endif - - /** -+ @def mysql_file_delete_with_symlink(K, P1, P2, P3) -+ Instrumented delete with symbolic link. -+ @c mysql_file_delete_with_symlink is a replacement -+ for @c my_handler_delete_with_symlink. -+*/ -+#ifdef HAVE_PSI_INTERFACE -+ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ -+ inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3) -+#else -+ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ -+ inline_mysql_file_delete_with_symlink(P1, P2, P3) -+#endif -+ -+/** - @def mysql_file_rename_with_symlink(K, P1, P2, P3) - Instrumented rename with symbolic link. - @c mysql_file_rename_with_symlink is a replacement -@@ -1305,6 +1319,7 @@ inline_mysql_file_rename( - return result; - } - -+ - static inline File - inline_mysql_file_create_with_symlink( - #ifdef HAVE_PSI_INTERFACE -@@ -1335,6 +1350,38 @@ inline_mysql_file_create_with_symlink( - } - - static inline int -+inline_mysql_file_delete_with_symlink( -+#ifdef HAVE_PSI_INTERFACE -+ PSI_file_key key, const char *src_file, uint src_line, -+#endif -+ const char *name, const char *ext, myf flags) -+{ -+ int result; -+ char fullname[FN_REFLEN]; -+#ifdef HAVE_PSI_INTERFACE -+ struct PSI_file_locker *locker= NULL; -+ PSI_file_locker_state state; -+#endif -+ fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); -+#ifdef HAVE_PSI_INTERFACE -+ if (likely(PSI_server != NULL)) -+ { -+ locker= PSI_server->get_thread_file_name_locker(&state, key, PSI_FILE_DELETE, -+ fullname, &locker); -+ if (likely(locker != NULL)) -+ PSI_server->start_file_wait(locker, (size_t) 0, src_file, src_line); -+ } -+#endif -+ result= my_handler_delete_with_symlink(fullname, flags); -+#ifdef HAVE_PSI_INTERFACE -+ if (likely(locker != NULL)) -+ PSI_server->end_file_wait(locker, (size_t) 0); -+#endif -+ return result; -+} -+ -+ -+static inline int - inline_mysql_file_rename_with_symlink( - #ifdef HAVE_PSI_INTERFACE - PSI_file_key key, const char *src_file, uint src_line, -diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c -index 5fe7b8f..c851468 100644 ---- mysys/my_symlink2.c.orig -+++ mysys/my_symlink2.c -@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) - in this case both the symlink and the symlinked file are deleted, - but only if the symlinked file is not in the datadir. - */ --int my_handler_delete_with_symlink(PSI_file_key key, const char *name, -- const char *ext, myf sync_dir) -+int my_handler_delete_with_symlink(const char *filename, myf sync_dir) - { -- char orig[FN_REFLEN], real[FN_REFLEN]; -+ char real[FN_REFLEN]; - int res= 0; - DBUG_ENTER("my_handler_delete_with_symlink"); - -- fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); -- if (my_is_symlink(orig)) -+ if (my_is_symlink(filename)) - { - /* - Delete the symlinked file only if the symlink is not - pointing into datadir. - */ -- if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) -- res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | MY_WME | sync_dir)); -+ if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) -+ res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); - } -- DBUG_RETURN(mysql_file_delete(key, orig, MYF(MY_WME | sync_dir)) || res); -+ DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); - } -diff --git a/sql/handler.cc b/sql/handler.cc -index 2ae144a..dc40e34 100644 ---- sql/handler.cc.orig -+++ sql/handler.cc -@@ -3381,7 +3381,7 @@ int handler::delete_table(const char *name) - - for (const char **ext=bas_ext(); *ext ; ext++) - { -- if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) -+ if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) - { - if (my_errno != ENOENT) - { -diff --git a/sql/sql_db.cc b/sql/sql_db.cc -index 7bb4f0f..580590b 100644 ---- sql/sql_db.cc.orig -+++ sql/sql_db.cc -@@ -1085,7 +1085,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, - We ignore ENOENT error in order to skip files that was deleted - by concurrently running statement like REPAIR TABLE ... - */ -- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && -+ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && - my_errno != ENOENT) - { - my_error(EE_DELETE, MYF(0), filePath, my_errno); -@@ -1206,7 +1206,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) - continue; - } - strxmov(filePath, org_path, "/", file->name, NullS); -- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) -+ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) - { - goto err; - } -diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c -index c4bcd5b..f80ec13 100644 ---- storage/maria/ma_delete_table.c.orig -+++ storage/maria/ma_delete_table.c -@@ -86,8 +86,8 @@ int maria_delete_table_files(const char *name, myf sync_dir) - { - DBUG_ENTER("maria_delete_table_files"); - -- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || -- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) -+ if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || -+ mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) - DBUG_RETURN(my_errno); - DBUG_RETURN(0); - } -diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c -index ebedfbd..ca395ff 100644 ---- storage/myisam/mi_delete_table.c.orig -+++ storage/myisam/mi_delete_table.c -@@ -28,8 +28,8 @@ int mi_delete_table(const char *name) - check_table_is_closed(name,"delete"); - #endif - -- if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || -- my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) -+ if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || -+ mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) - DBUG_RETURN(my_errno); - DBUG_RETURN(0); - } diff --git a/databases/mariadb55-server/files/patch-client_CMakeLists.txt b/databases/mariadb55-server/files/patch-client_CMakeLists.txt index 1407d30f66fa..2da687b78acd 100644 --- a/databases/mariadb55-server/files/patch-client_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-client_CMakeLists.txt @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ client/CMakeLists.txt 2012-12-23 02:37:04.000000000 +0200 -@@ -26,6 +26,7 @@ +--- client/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ client/CMakeLists.txt +@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES( ) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) -@@ -33,6 +34,7 @@ +@@ -33,6 +34,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -16,7 +16,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -40,6 +42,7 @@ +@@ -40,6 +42,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) @@ -24,9 +24,9 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -48,17 +51,21 @@ - +@@ -49,17 +52,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +ENDIF() @@ -46,7 +46,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -68,17 +75,20 @@ +@@ -69,17 +76,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) diff --git a/databases/mariadb55-server/files/patch-cmake__jemalloc.cmake b/databases/mariadb55-server/files/patch-cmake_jemalloc.cmake index 2b32419de733..f075ff3b7990 100644 --- a/databases/mariadb55-server/files/patch-cmake__jemalloc.cmake +++ b/databases/mariadb55-server/files/patch-cmake_jemalloc.cmake @@ -1,6 +1,6 @@ ---- cmake/jemalloc.cmake.orig 2014-10-08 15:19:51.000000000 +0200 -+++ cmake/jemalloc.cmake 2014-11-16 20:27:50.032638191 +0100 -@@ -22,11 +22,11 @@ +--- cmake/jemalloc.cmake.orig 2017-04-30 11:09:29 UTC ++++ cmake/jemalloc.cmake +@@ -22,11 +22,11 @@ MACRO (CHECK_JEMALLOC) SET(libname jemalloc) ENDIF() diff --git a/databases/mariadb55-server/files/patch-extra_CMakeLists.txt b/databases/mariadb55-server/files/patch-extra_CMakeLists.txt index 10ca17724af4..85a60ef5a7eb 100644 --- a/databases/mariadb55-server/files/patch-extra_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-extra_CMakeLists.txt @@ -1,11 +1,14 @@ ---- extra/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ extra/CMakeLists.txt 2012-12-23 02:41:57.000000000 +0200 -@@ -80,6 +80,8 @@ +--- extra/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ extra/CMakeLists.txt +@@ -80,9 +80,11 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) - ENDIF() + +ENDIF() + MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) + TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) + ENDIF() diff --git a/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp index 214edfd8834a..67c12b4e8112 100644 --- a/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -1,6 +1,6 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 -+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 -@@ -75,7 +75,7 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2017-04-30 11:09:29 UTC ++++ extra/yassl/taocrypt/src/integer.cpp +@@ -74,7 +74,7 @@ template <class T> CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( size_type n, const void *) { diff --git a/databases/mariadb55-server/files/patch-include_CMakeLists.txt b/databases/mariadb55-server/files/patch-include_CMakeLists.txt index 6494f1b9933c..97167a195d79 100644 --- a/databases/mariadb55-server/files/patch-include_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-include_CMakeLists.txt @@ -1,7 +1,7 @@ ---- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ include/CMakeLists.txt 2012-12-23 05:49:42.000000000 +0200 -@@ -54,17 +54,21 @@ - handler_state.h +--- include/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ include/CMakeLists.txt +@@ -55,20 +55,24 @@ SET(HEADERS + handler_ername.h ) +IF(FALSE) @@ -22,3 +22,6 @@ PATTERN mysql EXCLUDE REGEX "\\./(${EXCL_RE}$)" EXCLUDE) +ENDIF() + + INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" diff --git a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt index 18be6bfa471a..bab811fa15bf 100644 --- a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2014-04-15 14:02:39.000000000 +0300 -+++ libmysql/CMakeLists.txt 2014-05-16 19:33:07.000000000 +0300 -@@ -377,7 +377,7 @@ +--- libmysql/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ libmysql/CMakeLists.txt +@@ -425,7 +425,7 @@ SET(LIBS clientlib dbug strings vio mysy # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -8,8 +8,8 @@ +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) # Visual Studio users need debug static library for debug projects - INSTALL_DEBUG_SYMBOLS(clientlib) -@@ -386,6 +386,7 @@ + IF(MSVC) +@@ -433,6 +433,7 @@ IF(MSVC) INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() @@ -17,7 +17,7 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -400,11 +401,13 @@ +@@ -447,11 +448,13 @@ IF(UNIX) ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() @@ -32,7 +32,7 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -448,3 +451,4 @@ +@@ -495,3 +498,4 @@ IF(NOT DISABLE_SHARED) ENDFOREACH() ENDIF() ENDIF() diff --git a/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt index 377feb832067..415787052dfa 100644 --- a/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt @@ -1,7 +1,7 @@ ---- libservices/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ libservices/CMakeLists.txt 2012-12-23 17:32:35.000000000 +0200 -@@ -24,4 +24,6 @@ - debug_sync_service.c) +--- libservices/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ libservices/CMakeLists.txt +@@ -26,4 +26,6 @@ SET(MYSQLSERVICES_SOURCES + logger_service.c) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) +IF(FALSE) diff --git a/databases/mariadb55-server/files/patch-man_CMakeLists.txt b/databases/mariadb55-server/files/patch-man_CMakeLists.txt index 873a4fbdad04..f49da31f09d6 100644 --- a/databases/mariadb55-server/files/patch-man_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-man_CMakeLists.txt @@ -1,6 +1,6 @@ ---- man/CMakeLists.txt.orig 2014-06-13 13:58:21.397251542 +0300 -+++ man/CMakeLists.txt 2014-06-13 14:00:24.132245109 +0300 -@@ -33,7 +33,8 @@ +--- man/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC ++++ man/CMakeLists.txt +@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) diff --git a/databases/mariadb55-server/files/patch-mysys_default.c b/databases/mariadb55-server/files/patch-mysys_default.c index d99332492a41..e36841601a62 100644 --- a/databases/mariadb55-server/files/patch-mysys_default.c +++ b/databases/mariadb55-server/files/patch-mysys_default.c @@ -1,6 +1,6 @@ ---- mysys/default.c.orig 2013-10-01 21:15:03.544135869 +0200 -+++ mysys/default.c 2013-10-01 21:15:38.871375504 +0200 -@@ -89,7 +89,7 @@ +--- mysys/default.c.orig 2017-04-30 11:09:31 UTC ++++ mysys/default.c +@@ -89,7 +89,7 @@ static my_bool defaults_already_read= FA /* Which directories are searched for options (and in which order) */ @@ -9,7 +9,7 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -785,7 +785,7 @@ +@@ -786,7 +786,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -18,7 +18,7 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ +@@ -804,6 +804,14 @@ static int search_default_file_with_ext( if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) return 1; /* Ignore wrong files */ @@ -33,7 +33,7 @@ while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; -@@ -1067,7 +1067,8 @@ +@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ *end++= '.'; strxmov(end, conf_file, *ext, " ", NullS); @@ -43,7 +43,7 @@ } } } -@@ -1226,10 +1226,8 @@ +@@ -1227,10 +1236,8 @@ static const char **init_default_directo errors += add_directory(alloc, "/etc/", dirs); errors += add_directory(alloc, "/etc/mysql/", dirs); diff --git a/databases/mariadb55-server/files/patch-regex_CMakeLists.txt b/databases/mariadb55-server/files/patch-regex_CMakeLists.txt index 932776474884..ab79c3bf56c0 100644 --- a/databases/mariadb55-server/files/patch-regex_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-regex_CMakeLists.txt @@ -1,6 +1,6 @@ ---- regex/CMakeLists.txt.orig 2012-12-23 06:02:57.000000000 +0200 -+++ regex/CMakeLists.txt 2012-12-23 06:03:01.000000000 +0200 -@@ -18,4 +18,6 @@ +--- regex/CMakeLists.txt.orig 2017-04-30 11:09:31 UTC ++++ regex/CMakeLists.txt +@@ -18,4 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c) ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES}) diff --git a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt index 8e8938618637..47351d60a1d0 100644 --- a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2014-04-15 14:02:28.000000000 +0300 -+++ scripts/CMakeLists.txt 2014-05-16 19:36:34.000000000 +0300 -@@ -276,6 +276,8 @@ +--- scripts/CMakeLists.txt.orig 2017-04-30 11:09:31 UTC ++++ scripts/CMakeLists.txt +@@ -270,6 +270,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) ENDIF() @@ -9,7 +9,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -332,16 +334,11 @@ +@@ -326,16 +328,11 @@ ELSE() ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY) # On Unix, most of the files end up in the bin directory SET(BIN_SCRIPTS diff --git a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh b/databases/mariadb55-server/files/patch-scripts_mysql__config.sh index 2cbe2aae424a..8788844b5670 100644 --- a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh +++ b/databases/mariadb55-server/files/patch-scripts_mysql__config.sh @@ -1,6 +1,6 @@ ---- scripts/mysql_config.sh.orig 2014-10-17 21:44:16.000000000 +0200 -+++ scripts/mysql_config.sh 2014-10-17 21:54:16.000000000 +0200 -@@ -109,8 +109,11 @@ +--- scripts/mysql_config.sh.orig 2017-04-30 11:09:31 UTC ++++ scripts/mysql_config.sh +@@ -109,8 +109,11 @@ fi # We intentionally add a space to the beginning and end of lib strings, simplifies replace later libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " diff --git a/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh b/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh index a2d582ec94be..efd0873733bb 100644 --- a/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh +++ b/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh @@ -1,4 +1,4 @@ ---- scripts/mysqld_safe.sh.orig 2017-01-09 14:36:43 UTC +--- scripts/mysqld_safe.sh.orig 2017-04-30 11:09:31 UTC +++ scripts/mysqld_safe.sh @@ -468,10 +468,10 @@ fi diff --git a/databases/mariadb55-server/files/patch-sql_CMakeLists.txt b/databases/mariadb55-server/files/patch-sql_CMakeLists.txt index 47e93ad71348..1e0e1c182d6c 100644 --- a/databases/mariadb55-server/files/patch-sql_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-sql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- sql/CMakeLists.txt.orig 2013-05-22 01:09:51.000000000 +0300 -+++ sql/CMakeLists.txt 2013-06-08 14:13:06.000000000 +0300 -@@ -268,6 +268,7 @@ +--- sql/CMakeLists.txt.orig 2017-04-30 11:09:31 UTC ++++ sql/CMakeLists.txt +@@ -276,6 +276,7 @@ ADD_CUSTOM_TARGET(distclean VERBATIM ) @@ -8,7 +8,7 @@ IF(INSTALL_LAYOUT STREQUAL "STANDALONE") # Copy db.opt into data/test/ -@@ -311,6 +312,7 @@ +@@ -319,6 +320,7 @@ ELSE() INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF(WIN32 AND MYSQLD_EXECUTABLE) ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") @@ -16,7 +16,7 @@ IF(WIN32) SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -353,8 +355,10 @@ +@@ -361,8 +363,10 @@ IF(WIN32) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) ENDIF(WIN32) diff --git a/databases/mariadb55-server/files/patch-sql_item_subselect.cc b/databases/mariadb55-server/files/patch-sql_item__subselect.cc index 6ab58d3b0deb..f0b3fc672ac5 100644 --- a/databases/mariadb55-server/files/patch-sql_item_subselect.cc +++ b/databases/mariadb55-server/files/patch-sql_item__subselect.cc @@ -1,6 +1,6 @@ ---- sql/item_subselect.cc.orig 2013-05-21 22:09:51.000000000 +0000 -+++ sql/item_subselect.cc 2013-09-26 13:13:01.105197491 +0000 -@@ -1317,7 +1317,7 @@ +--- sql/item_subselect.cc.orig 2017-04-30 11:09:31 UTC ++++ sql/item_subselect.cc +@@ -1329,7 +1329,7 @@ Item_exists_subselect::Item_exists_subse Item_subselect() { DBUG_ENTER("Item_exists_subselect::Item_exists_subselect"); diff --git a/databases/mariadb55-server/files/patch-sql_sql_trigger.cc b/databases/mariadb55-server/files/patch-sql_sql__trigger.cc index be49b1f5f758..744f03981d6c 100644 --- a/databases/mariadb55-server/files/patch-sql_sql_trigger.cc +++ b/databases/mariadb55-server/files/patch-sql_sql__trigger.cc @@ -1,6 +1,6 @@ ---- sql/sql_trigger.cc.orig 2013-05-21 22:09:51.000000000 +0000 -+++ sql/sql_trigger.cc 2013-09-26 13:15:55.450195525 +0000 -@@ -192,32 +192,32 @@ +--- sql/sql_trigger.cc.orig 2017-04-30 11:09:31 UTC ++++ sql/sql_trigger.cc +@@ -192,32 +192,32 @@ static File_option triggers_file_paramet { { { C_STRING_WITH_LEN("triggers") }, @@ -39,7 +39,7 @@ FILE_OPTIONS_STRLIST }, { { 0, 0 }, 0, FILE_OPTIONS_STRING } -@@ -226,7 +226,7 @@ +@@ -226,7 +226,7 @@ static File_option triggers_file_paramet File_option sql_modes_parameters= { { C_STRING_WITH_LEN("sql_modes") }, diff --git a/databases/mariadb55-server/files/patch-sql_sql_view.cc b/databases/mariadb55-server/files/patch-sql_sql__view.cc index 8b6d0b84579f..bdc13517e564 100644 --- a/databases/mariadb55-server/files/patch-sql_sql_view.cc +++ b/databases/mariadb55-server/files/patch-sql_sql__view.cc @@ -1,6 +1,6 @@ ---- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000 -+++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000 -@@ -742,46 +742,46 @@ +--- sql/sql_view.cc.orig 2017-04-30 11:09:31 UTC ++++ sql/sql_view.cc +@@ -760,46 +760,46 @@ static const int required_view_parameter */ static File_option view_parameters[]= {{{ C_STRING_WITH_LEN("query")}, @@ -59,5 +59,5 @@ - my_offsetof(TABLE_LIST, view_body_utf8), + static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), FILE_OPTIONS_ESTRING}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} + {{ C_STRING_WITH_LEN("mariadb-version")}, + my_offsetof(TABLE_LIST, mariadb_version), diff --git a/databases/mariadb55-server/files/patch-sql_sys_vars.cc b/databases/mariadb55-server/files/patch-sql_sys__vars.cc index e8f0caff4aff..95f0896fac20 100644 --- a/databases/mariadb55-server/files/patch-sql_sys_vars.cc +++ b/databases/mariadb55-server/files/patch-sql_sys__vars.cc @@ -1,15 +1,15 @@ ---- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200 -+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 -@@ -900,7 +900,7 @@ +--- sql/sys_vars.cc.orig 2017-04-30 11:09:31 UTC ++++ sql/sys_vars.cc +@@ -826,7 +826,7 @@ static Sys_var_ulong Sys_interactive_tim "connection before closing it", SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - static Sys_var_ulong Sys_join_buffer_size( + static Sys_var_ulonglong Sys_join_buffer_size( "join_buffer_size", -@@ -1401,7 +1401,7 @@ +@@ -1356,7 +1356,7 @@ static Sys_var_ulong Sys_net_read_timeou "Number of seconds to wait for more data from a connection before " "aborting the read", SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), @@ -18,7 +18,7 @@ NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_read_timeout)); -@@ -1416,7 +1416,7 @@ +@@ -1371,7 +1371,7 @@ static Sys_var_ulong Sys_net_write_timeo "Number of seconds to wait for a block to be written to a connection " "before aborting the write", SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), @@ -27,7 +27,7 @@ NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_write_timeout)); -@@ -2257,7 +2257,7 @@ +@@ -2480,7 +2480,7 @@ static Sys_var_ulong Sys_net_wait_timeou "The number of seconds the server waits for activity on a " "connection before closing it", SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), |