Merge branch '10.6' into 10.11

THIRDPARTY

@@ -1712,3 +1712,32 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************
+
+%%The following software may be included in this product:
+socketpair.c
+
+Copyright 2007, 2010 by Nathan C. Myers <[email protected]>
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ The name of the author must not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */

client/mysql.cc

@@ -261,6 +261,9 @@ static int connect_flag=CLIENT_INTERACTIVE;
 static my_bool opt_binary_mode= FALSE;
 static my_bool opt_connect_expired_password= FALSE;
 static int interrupted_query= 0;
+#ifdef USE_LIBEDIT_INTERFACE
+static int sigint_received= 0;
+#endif
 static char *current_host,*current_db,*current_user=0,*opt_password=0,
  *current_prompt=0, *delimiter_str= 0,
  *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME,
@@ -1162,6 +1165,8 @@ extern "C" sig_handler handle_sigint(int sig);
 static sig_handler window_resize(int sig);
 #endif
 
+static void end_in_sig_handler(int sig);
+static bool kill_query(const char *reason);
 
 const char DELIMITER_NAME[]= "delimiter";
 const uint DELIMITER_NAME_LEN= sizeof(DELIMITER_NAME) - 1;
@@ -1301,8 +1306,8 @@ int main(int argc,char *argv[])
  if (opt_sigint_ignore)
  signal(SIGINT, SIG_IGN);
  else
- signal(SIGINT, handle_sigint);  // Catch SIGINT to clean up
- signal(SIGQUIT, mysql_end); // Catch SIGQUIT to clean up
+ signal(SIGINT, handle_sigint); // Catch SIGINT to clean up
+ signal(SIGQUIT, mysql_end); // Catch SIGQUIT to clean up
 
 #if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
  /* Readline will call this if it installs a handler */
@@ -1512,30 +1517,35 @@ static bool do_connect(MYSQL *mysql, const char *host, const char *user,
 }
 
 
-/*
- This function handles sigint calls
- If query is in process, kill query
- If 'source' is executed, abort source command
- no query in process, terminate like previous behavior
- */
+void end_in_sig_handler(int sig)
+{
+#ifdef _WIN32
+ /*
+ When SIGINT is raised on Windows, the OS creates a new thread to handle the
+ interrupt. Once that thread completes, the main thread continues running
+ only to find that it's resources have already been free'd when the sigint
+ handler called mysql_end().
+ */
+ mysql_thread_end();
+#else
+ mysql_end(sig);
+#endif
+}
 
-sig_handler handle_sigint(int sig)
+
+/*
+ Kill a running query. Returns true if we were unable to connect to the server.
+*/
+bool kill_query(const char *reason)
 {
  char kill_buffer[40];
  MYSQL *kill_mysql= NULL;
 
- /* terminate if no query being executed, or we already tried interrupting */
- if (!executing_query || (interrupted_query == 2))
- {
- tee_fprintf(stdout, "Ctrl-C -- exit!\n");
- goto err;
- }
-
  kill_mysql= mysql_init(kill_mysql);
  if (!do_connect(kill_mysql,current_host, current_user, opt_password, "", 0))
  {
- tee_fprintf(stdout, "Ctrl-C -- sorry, cannot connect to server to kill query, giving up ...\n");
- goto err;
+ tee_fprintf(stdout, "%s -- sorry, cannot connect to server to kill query, giving up ...\n", reason);
+ return true;
  }
 
  /* First time try to kill the query, second time the connection */
@@ -1550,27 +1560,62 @@ sig_handler handle_sigint(int sig)
  (interrupted_query == 1) ? "QUERY " : "",
  mysql_thread_id(&mysql));
  if (verbose)
- tee_fprintf(stdout, "Ctrl-C -- sending \"%s\" to server ...\n",
+ tee_fprintf(stdout, "%s -- sending \"%s\" to server ...\n", reason,
  kill_buffer);
  mysql_real_query(kill_mysql, kill_buffer, (uint) strlen(kill_buffer));
  mysql_close(kill_mysql);
- tee_fprintf(stdout, "Ctrl-C -- query killed. Continuing normally.\n");
+ if (interrupted_query == 1)
+ tee_fprintf(stdout, "%s -- query killed.\n", reason);
+ else
+ tee_fprintf(stdout, "%s -- connection killed.\n", reason);
+
  if (in_com_source)
  aborted= 1; // Abort source command
- return;
+ return false;
+}
 
-err:
-#ifdef _WIN32
+/*
+ This function handles sigint calls
+ If query is in process, kill query
+ If 'source' is executed, abort source command
+ no query in process, regenerate prompt.
+*/
+sig_handler handle_sigint(int sig)
+{
  /*
- When SIGINT is raised on Windows, the OS creates a new thread to handle the
- interrupt. Once that thread completes, the main thread continues running 
- only to find that it's resources have already been free'd when the sigint 
- handler called mysql_end(). 
+ On Unix only, if no query is being executed just clear the prompt,
+ don't exit. On Windows we exit.
  */
- mysql_thread_end();
+ if (!executing_query)
+ {
+#ifndef _WIN32
+ tee_fprintf(stdout, "^C\n");
+#ifdef USE_LIBEDIT_INTERFACE
+ /* Libedit will regenerate it outside of the signal handler. */
+ sigint_received= 1;
 #else
- mysql_end(sig);
-#endif 
+ rl_on_new_line(); // Regenerate the prompt on a newline
+ rl_replace_line("", 0); // Clear the previous text
+ rl_redisplay();
+#endif
+#else // WIN32
+ tee_fprintf(stdout, "Ctrl-C -- exit!\n");
+ end_in_sig_handler(sig);
+#endif
+ return;
+ }
+
+ /*
+ When executing a query, this newline makes the prompt look like so:
+ ^C
+ Ctrl-C -- query killed.
+ */
+ tee_fprintf(stdout, "\n");
+ if (kill_query("Ctrl-C"))
+ {
+ aborted= 1;
+ end_in_sig_handler(sig);
+ }
 }
 
 
@@ -2137,6 +2182,15 @@ static int get_options(int argc, char **argv)
  return(0);
 }
 
+
+#if !defined(_WIN32) && defined(USE_LIBEDIT_INTERFACE)
+static inline void reset_prompt(char *in_string, bool *ml_comment) {
+ glob_buffer.length(0);
+ *ml_comment = false;
+ *in_string = 0;
+}
+#endif
+
 static int read_and_execute(bool interactive)
 {
  char *line= NULL;
@@ -2228,7 +2282,30 @@ static int read_and_execute(bool interactive)
  if (line)
  free(line);
  line= readline(prompt);
-#endif /* defined(_WIN32) */
+#ifdef USE_LIBEDIT_INTERFACE
+ /*
+ libedit handles interrupts different than libreadline.
+ libreadline has its own signal handlers, thus a sigint during readline
+ doesn't force readline to return null string.
+
+ However libedit returns null if the interrupt signal is raised.
+ We can also get an empty string when ctrl+d is pressed (EoF).
+
+ We need this sigint_received flag, to differentiate between the two
+ cases. This flag is only set during our handle_sigint function when
+ LIBEDIT_INTERFACE is used.
+ */
+ if (!line && sigint_received)
+ {
+ // User asked to clear the input.
+ sigint_received= 0;
+ reset_prompt(&in_string, &ml_comment);
+ continue;
+ }
+ // For safety, we always mark this as cleared.
+ sigint_received= 0;
+#endif
+#endif /* defined(__WIN__) */
 
  /*
  When Ctrl+d or Ctrl+z is pressed, the line may be NULL on some OS

client/mysqltest.cc

@@ -4698,15 +4698,11 @@ void do_perl(struct st_command *command)
 
  /* Check for error code that indicates perl could not be started */
  int exstat= WEXITSTATUS(error);
-#ifdef _WIN32
- if (exstat == 1)
- /* Text must begin 'perl not found' as mtr looks for it */
- abort_not_supported_test("perl not found in path or did not start");
-#else
+#ifndef _WIN32
  if (exstat == 127)
  abort_not_supported_test("perl not found in path");
-#endif
  else
+#endif
  handle_command_error(command, exstat, my_errno);
  }
  dynstr_free(&ds_delimiter);

cmake/package_name.cmake

@@ -102,11 +102,7 @@ IF(NOT VERSION)
  SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
  ENDIF()
  ELSE()
- IF(64BIT)
- SET(DEFAULT_MACHINE "x86_64")
- ELSE()
- SET(DEFAULT_MACHINE "i386")
- ENDIF()
+ SET(DEFAULT_MACHINE ${CMAKE_SYSTEM_PROCESSOR})
  ENDIF()
 
  IF(DEFAULT_MACHINE MATCHES "i386")

cmake/pcre.cmake

@@ -81,18 +81,15 @@ MACRO (CHECK_PCRE)
  FIND_PACKAGE(PkgConfig QUIET)
  PKG_CHECK_MODULES(PCRE libpcre2-8)
  # in case pkg-config or libpcre2-8.pc is not installed:
- IF(NOT PCRE_FOUND)
- UNSET(PCRE_FOUND CACHE)
- CHECK_LIBRARY_EXISTS(pcre2-8 pcre2_match_8 "" PCRE_FOUND)
- ENDIF()
+ CHECK_LIBRARY_EXISTS(pcre2-8 pcre2_match_8 "${PCRE_LIBRARY_DIRS}" HAVE_PCRE2_MATCH_8)
  ENDIF()
- IF(NOT PCRE_FOUND OR WITH_PCRE STREQUAL "bundled")
+ IF(NOT HAVE_PCRE2_MATCH_8 OR WITH_PCRE STREQUAL "bundled")
  IF (WITH_PCRE STREQUAL "system")
  MESSAGE(FATAL_ERROR "system pcre2-8 library is not found or unusable")
  ENDIF()
  BUNDLE_PCRE2()
  ELSE()
- CHECK_LIBRARY_EXISTS(pcre2-posix PCRE2regcomp "" NEEDS_PCRE2_DEBIAN_HACK)
+ CHECK_LIBRARY_EXISTS(pcre2-posix PCRE2regcomp "${PCRE_LIBRARY_DIRS}" NEEDS_PCRE2_DEBIAN_HACK)
  IF(NEEDS_PCRE2_DEBIAN_HACK)
  SET(PCRE2_DEBIAN_HACK "-Dregcomp=PCRE2regcomp -Dregexec=PCRE2regexec -Dregerror=PCRE2regerror -Dregfree=PCRE2regfree")
  ENDIF()

cmake/readline.cmake

@@ -114,6 +114,9 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
  {
  rl_completion_func_t *func1= (rl_completion_func_t*)0;
  rl_compentry_func_t *func2= (rl_compentry_func_t*)0;
+ rl_on_new_line();
+ rl_replace_line(\"\", 0);
+ rl_redisplay();
  }"
  NEW_READLINE_INTERFACE)
 

config.h.cmake

@@ -73,6 +73,7 @@
 #cmakedefine HAVE_SYS_IOCTL_H 1
 #cmakedefine HAVE_SYS_MALLOC_H 1
 #cmakedefine HAVE_SYS_MMAN_H 1
+#cmakedefine HAVE_SYS_MNTENT_H 1
 #cmakedefine HAVE_SYS_NDIR_H 1
 #cmakedefine HAVE_SYS_PTE_H 1
 #cmakedefine HAVE_SYS_PTEM_H 1

extra/mariabackup/backup_copy.cc

@@ -2291,7 +2291,7 @@ ds_ctxt_t::make_hardlink(const char *from_path, const char *to_path)
  }
  else
  {
- strncpy(to_path_full, to_path, sizeof(to_path_full));
+ strncpy(to_path_full, to_path, sizeof(to_path_full)-1);
  }
 #ifdef _WIN32
  return CreateHardLink(to_path_full, from_path, NULL);

extra/mariabackup/xtrabackup.cc

@@ -2191,7 +2191,7 @@ static bool innodb_init_param()
 
  /* Check that values don't overflow on 32-bit systems. */
  if (sizeof(ulint) == 4) {
- if (xtrabackup_use_memory > UINT_MAX32) {
+ if (xtrabackup_use_memory > (longlong) UINT_MAX32) {
  msg("mariabackup: use-memory can't be over 4GB"
  " on 32-bit systems");
  }

extra/wolfssl/user_settings.h.in

@@ -28,6 +28,11 @@
 #define NO_OLD_TIMEVAL_NAME
 #define HAVE_SECURE_RENEGOTIATION
 #define HAVE_EXTENDED_MASTER
+/*
+ Following is workaround about a WolfSSL 5.6.6 bug.
+ The bug is about undefined sessionCtxSz during compilation.
+*/
+#define WOLFSSL_SESSION_ID_CTX
 
 /* TLSv1.3 definitions (all needed to build) */
 #define WOLFSSL_TLS13

include/mysql_com.h

@@ -477,7 +477,7 @@ typedef struct st_net {
  char net_skip_rest_factor;
  my_bool thread_specific_malloc;
  unsigned char compress;
- my_bool unused3; /* Please remove with the next incompatible ABI change. */
+ my_bool pkt_nr_can_be_reset;
  /*
  Pointer to query object in query cache, do not equal NULL (0) for
  queries in cache that have not stored its results yet

libmysqld/libmysql.c

@@ -3229,7 +3229,8 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t
  {
  longlong data= my_strtoll10(value, &endptr, &err);
  *param->error= (IS_TRUNCATED(data, param->is_unsigned,
- INT_MIN32, INT_MAX32, UINT_MAX32) || err > 0);
+ (longlong) INT_MIN32, (longlong) INT_MAX32,
+ (longlong) UINT_MAX32) || err > 0);
  longstore(buffer, (int32) data);
  break;
  }
@@ -3346,7 +3347,8 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
  break;
  case MYSQL_TYPE_LONG:
  *param->error= IS_TRUNCATED(value, param->is_unsigned,
- INT_MIN32, INT_MAX32, UINT_MAX32);
+ (longlong) INT_MIN32, (longlong) INT_MAX32,
+ (longlong) UINT_MAX32);
  longstore(buffer, (int32) value);
  break;
  case MYSQL_TYPE_LONGLONG: