percona · percona-ysorokin · Nov 28, 2018 · May 28, 2018 · May 28, 2018 · May 28, 2018
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -241,6 +241,7 @@ INCLUDE(zlib)
 INCLUDE(lz4)
 INCLUDE(libevent)
 INCLUDE(ssl)
+INCLUDE(sasl)
 INCLUDE(readline)
 INCLUDE(protobuf)
 INCLUDE(mysql_version)
@@ -532,6 +533,12 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/libbinlogevents/export)
 # Add bundled or system zlib.
 MYSQL_CHECK_ZLIB_WITH_COMPRESS()
+IF(BUILD_BUNDLED_ZLIB)
+  INCLUDE_DIRECTORIES(SYSTEM
+    ${CMAKE_CURRENT_SOURCE_DIR}/zlib
+    ${CMAKE_CURRENT_BINARY_DIR}/zlib
+    )
+ENDIF()
 # Add bundled yassl/taocrypt or system openssl.
 MYSQL_CHECK_SSL()
 # Add system/bundled editline.
@@ -540,6 +547,8 @@ MYSQL_CHECK_EDITLINE()
 MYSQL_CHECK_LIBEVENT()
 # Add lz4 library
 MYSQL_CHECK_LZ4()
+# Add SASL library
+MYSQL_CHECK_SASL()
 # Add protoc and libprotobuf
 IF(NOT WITHOUT_SERVER)
   MYSQL_CHECK_PROTOBUF()

diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=7
-MYSQL_VERSION_PATCH=23
-MYSQL_VERSION_EXTRA=-25
+MYSQL_VERSION_PATCH=24
+MYSQL_VERSION_EXTRA=-26
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/client
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/mysys_ssl
-  ${ZLIB_INCLUDE_DIR}
   ${LZ4_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libmysql

diff --git a/client/mysql.cc b/client/mysql.cc
@@ -1656,7 +1656,7 @@ static struct my_option my_long_options[] =
   {"bind-address", 0, "IP address to bind to.",
    (uchar**) &opt_bind_addr, (uchar**) &opt_bind_addr, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"binary-as-hex", 'b', "Print binary data as hex", &opt_binhex, &opt_binhex,
+  {"binary-as-hex", 0, "Print binary data as hex", &opt_binhex, &opt_binhex,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"character-sets-dir", OPT_CHARSETS_DIR,
    "Directory for character set files.", &charsets_dir,

diff --git a/client/mysqldump.c b/client/mysqldump.c
@@ -1520,6 +1520,37 @@ static void restore_cs_variables(FILE *sql_file,
           (const char *) delimiter);
 }
 
+/*
+ This function will remove specific sql mode.
+
+  @param[in]   sql_mode      Original sql mode from where input mode needs to
+                             be removed.
+  @param[in]   replace_mode  sql mode which needs to be removed from original
+                             sql mode.
+  @param[in]   replace_len   length of sql mode which needs to be removed.
+
+  @retval  1 replace_mode is not present
+           0 replace_mode is removed successfully
+*/
+static int remove_sql_mode(char* sql_mode, const char* replace_mode,
+  size_t replace_len) {
+  char *start = strstr(sql_mode, replace_mode);
+  /* nothing to replace */
+  if (!start)
+    return 1;
+  /* sql mode to replace is the only sql mode present or the last one */
+  if (strlen(start) == replace_len) {
+    if (start == sql_mode)
+      *start = 0;
+    else
+      start[-1] = 0;
+  }
+  else {
+    const char *next = start + replace_len + 1;
+    memmove(start, next, strlen(next) + 1);
+  }
+  return 0;
+}
 
 static void switch_sql_mode(FILE *sql_file,
                             const char *delimiter,
@@ -2617,7 +2648,7 @@ static uint dump_events_for_db(char *db)
                       "The following dump may be incomplete.\n"
                     "--\n");
           }
-
+          remove_sql_mode(row[1], C_STRING_WITH_LEN("NO_AUTO_CREATE_USER"));
           switch_sql_mode(sql_file, delimiter, row[1]);
 
           switch_time_zone(sql_file, delimiter, row[2]);
@@ -2852,7 +2883,7 @@ static uint dump_routines_for_db(char *db)
                       "--\n");
             }
 
-
+            remove_sql_mode(row[1], C_STRING_WITH_LEN("NO_AUTO_CREATE_USER"));
             switch_sql_mode(sql_file, ";", row[1]);
 
             fprintf(sql_file,
@@ -4199,6 +4230,7 @@ static int dump_trigger(FILE *sql_file, MYSQL_RES *show_create_trigger_rs,
                         row[3],   /* character_set_results */
                         row[4]);  /* collation_connection */
 
+    remove_sql_mode(row[1], C_STRING_WITH_LEN("NO_AUTO_CREATE_USER"));
     switch_sql_mode(sql_file, ";", row[1]);
 
     if (opt_drop_trigger)

diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -114,10 +114,11 @@ IF(MSVC)
      SET("${flag}" "${${flag}} /EHsc")
     ENDFOREACH()
 
-  # Fix CMake's predefined huge stack size
   FOREACH(type EXE SHARED MODULE)
-   STRING(REGEX REPLACE "/STACK:([^ ]+)" "" CMAKE_${type}_LINKER_FLAGS "${CMAKE_${type}_LINKER_FLAGS}")
-   STRING(REGEX REPLACE "/INCREMENTAL:([^ ]+)" "" CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO}")
+    SET(CMAKE_${type}_LINKER_FLAGS_DEBUG
+	    "${CMAKE_${type}_LINKER_FLAGS_DEBUG} /INCREMENTAL:NO")
+    SET(CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO
+	    "${CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO} /INCREMENTAL:NO")
   ENDFOREACH()
 
   # Mark 32 bit executables large address aware so they can 

diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ MACRO(MYSQL_ADD_PLUGIN)
                     ${CMAKE_SOURCE_DIR}/sql/auth
                     ${CMAKE_SOURCE_DIR}/regex
                     ${SSL_INCLUDE_DIRS}
-                    ${ZLIB_INCLUDE_DIR})
+                    )
 
   LIST(GET ARG_DEFAULT_ARGS 0 plugin) 
   SET(SOURCES ${ARG_DEFAULT_ARGS})

diff --git a/cmake/sasl.cmake b/cmake/sasl.cmake
@@ -0,0 +1,62 @@
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+# cmake -DWITH_SASL=system|path
+# system is the default
+#
+# Sets SASL_LIBRARY. If not found, SASL_LIBRARY="".
+
+MACRO (FIND_SYSTEM_SASL)
+  FIND_LIBRARY(SASL_SYSTEM_LIBRARY NAMES "sasl2" "sasl")
+  IF (SASL_SYSTEM_LIBRARY)
+    SET(SYSTEM_SASL_FOUND 1)
+    SET(SASL_LIBRARY ${SASL_SYSTEM_LIBRARY})
+    MESSAGE(STATUS "SASL_LIBRARY ${SASL_LIBRARY}")
+  ENDIF()
+ENDMACRO()
+
+IF (NOT WITH_SASL)
+  SET(WITH_SASL "system" CACHE STRING "By default use system sasl library")
+ENDIF()
+
+MACRO (MYSQL_CHECK_SASL)
+  IF (NOT WITH_SASL OR WITH_SASL STREQUAL "system")
+    FIND_SYSTEM_SASL()
+    IF (NOT SYSTEM_SASL_FOUND)
+      MESSAGE(STATUS "Cannot find system sasl libraries.")
+      SET(SASL_LIBRARY "")
+    ENDIF()
+  ELSE()
+    FIND_LIBRARY(SASL_LIBRARY
+                 NAMES "sasl2" "sasl" "libsasl"
+                 PATHS ${WITH_SASL} ${WITH_SASL}/lib
+                 NO_DEFAULT_PATH
+                 NO_CMAKE_ENVIRONMENT_PATH
+                 NO_SYSTEM_ENVIRONMENT_PATH)
+    IF (NOT SASL_LIBRARY)
+      MESSAGE(STATUS "Cannot find sasl libraries in ${WITH_SASL}.") 
+      SET(SASL_LIBRARY "")
+    ELSE()
+      MESSAGE(STATUS "SASL_LIBRARY ${SASL_LIBRARY}")
+    ENDIF()
+  ENDIF()
+ENDMACRO()
diff --git a/cmake/tags.cmake b/cmake/tags.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,12 +15,29 @@
 
 # Generate tag files
 IF(UNIX)
-  ADD_CUSTOM_TARGET (tags
-    COMMAND support-files/build-tags
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-  ADD_CUSTOM_TARGET (ctags
-    COMMAND  ctags -R -f CTAGS
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
+  FIND_PROGRAM(CTAGS_EXECUTABLE ctags)
+  IF(NOT CTAGS_EXECUTABLE)
+    RETURN()
+  ENDIF()
+  EXEC_PROGRAM(${CTAGS_EXECUTABLE} ARGS --version OUTPUT_VARIABLE CTAGS_VERSION)
+
+  IF(CTAGS_VERSION MATCHES "Exuberant")
+    ADD_CUSTOM_TARGET(tags
+      COMMAND support-files/build-tags
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      )
+    ADD_CUSTOM_TARGET(ctags
+      COMMAND support-files/build-tags ctags
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      )
+  ELSE()
+    ADD_CUSTOM_TARGET (tags
+      COMMAND exit 1
+      COMMENT "Please install Exuberant Ctags"
+      )
+    ADD_CUSTOM_TARGET (ctags
+      COMMAND exit 1
+      COMMENT "Please install Exuberant Ctags"
+      )
+  ENDIF()
 ENDIF()
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
@@ -14,15 +14,11 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 MACRO (MYSQL_USE_BUNDLED_ZLIB)
+  SET(BUILD_BUNDLED_ZLIB 1)
   SET(ZLIB_LIBRARY zlib CACHE INTERNAL "Bundled zlib library")
-  SET(ZLIB_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/zlib CACHE STRING "Will not be redefined by FindZLIB")
   SET(ZLIB_FOUND  TRUE)
   SET(WITH_ZLIB "bundled" CACHE STRING "Use bundled zlib")
   ADD_SUBDIRECTORY(zlib)
-  GET_TARGET_PROPERTY(src zlib SOURCES)
-  FOREACH(file ${src})
-    SET(ZLIB_SOURCES ${ZLIB_SOURCES} ${CMAKE_SOURCE_DIR}/zlib/${file})
-  ENDFOREACH()
 ENDMACRO()
 
 # MYSQL_CHECK_ZLIB_WITH_COMPRESS

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}/include 
-${ZLIB_INCLUDE_DIR}
 ${LZ4_INCLUDE_DIR}
 # Following is for perror, in case NDB is compiled in.
 ${CMAKE_SOURCE_DIR}/storage/ndb/include

diff --git a/extra/protobuf/CMakeLists.txt b/extra/protobuf/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -71,7 +71,6 @@ ENDIF()
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/protobuf-2.6.1/src
-  ${ZLIB_INCLUDE_DIR}
 )
 
 SET(PROTO_SRC_DIR

diff --git a/include/mysql/group_replication_priv.h b/include/mysql/group_replication_priv.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -37,12 +37,9 @@
 
 
 /**
-  Server side initializations and cleanup.
+  Server side initializations.
 */
-int group_replication_init(const char* plugin_name);
-int group_replication_cleanup();
-int group_replication_start();
-int group_replication_stop();
+int group_replication_init();
 
 
 /**

diff --git a/libbinlogevents/CMakeLists.txt b/libbinlogevents/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,7 @@ INCLUDE(configure.cmake)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libbinlogevents/include
-                    ${CMAKE_SOURCE_DIR}/libbinlogevents/export
-                    # ZLIB_INCLUDE_DIR points to ${CMAKE_SOURCE_DIR}/zlib,
-                    # when compiled with MySQL server version (< 5.7).
-                    # It is NULL otherwise.
-                    ${ZLIB_INCLUDE_DIR})
+                    ${CMAKE_SOURCE_DIR}/libbinlogevents/export)
 
 CONFIGURE_FILE(binlog_config.h.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/include/binlog_config.h)

diff --git a/libbinlogstandalone/CMakeLists.txt b/libbinlogstandalone/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,18 +27,11 @@ ADD_DEFINITIONS(-DSTANDALONE_BINLOG)
 #  INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
 #ENDIF()
 
-FIND_PACKAGE(ZLIB REQUIRED)
-
-
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libbinlogevents/include
                     ${CMAKE_CURRENT_BINARY_DIR}/../libbinlogevents/include
                     ${CMAKE_SOURCE_DIR}/libbinlogevents/export
-                    ${CMAKE_CURRENT_BINARY_DIR}/libbinlogevents/export
-                    # ZLIB_INCLUDE_DIR points to ${CMAKE_SOURCE_DIR}/zlib,
-                    # when compiled with MySQL server version (< 5.7).
-                    # It is NULL otherwise.
-                    ${ZLIB_INCLUDE_DIR})
+                    ${CMAKE_CURRENT_BINARY_DIR}/libbinlogevents/export)
 
 ADD_SUBDIRECTORY(src)