Merge mariadb-10.2.33

Author: dr-m

mysql-test/suite/rpl/r/rpl_parallel2.result

@@ -2,8 +2,10 @@ include/rpl_init.inc [topology=1->2]
 *** MDEV-5509: Incorrect value for Seconds_Behind_Master if parallel replication ***
 connection server_2;
 SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
+set @old_parallel_mode= @@GLOBAL.slave_parallel_mode;
 include/stop_slave.inc
 SET GLOBAL slave_parallel_threads=5;
+set global slave_parallel_mode= optimistic;
 include/start_slave.inc
 connection server_1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT);
@@ -157,6 +159,7 @@ UNLOCK TABLES;
 connection server_2;
 include/stop_slave.inc
 SET GLOBAL slave_parallel_threads=@old_parallel_threads;
+set global slave_parallel_mode= @old_parallel_mode;
 include/start_slave.inc
 connection server_1;
 DROP TABLE t1, t2;

mysql-test/suite/rpl/t/rpl_parallel2.test

@@ -8,8 +8,10 @@
 
 --connection server_2
 SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
+set @old_parallel_mode= @@GLOBAL.slave_parallel_mode;
 --source include/stop_slave.inc
 SET GLOBAL slave_parallel_threads=5;
+set global slave_parallel_mode= optimistic;
 --source include/start_slave.inc
 
 --connection server_1
@@ -219,6 +221,7 @@ UNLOCK TABLES;
 --connection server_2
 --source include/stop_slave.inc
 SET GLOBAL slave_parallel_threads=@old_parallel_threads;
+set global slave_parallel_mode= @old_parallel_mode;
 --source include/start_slave.inc
 
 --connection server_1

mysys/stacktrace.c

@@ -37,7 +37,7 @@
 #ifdef __linux__
 #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
 static char *heap_start;
-extern char *__bss_start;
+char *__bss_start;
 #else
 #define PTR_SANE(p) (p)
 #endif /* __linux */

sql/rpl_parallel.cc

@@ -378,13 +378,14 @@ do_gco_wait(rpl_group_info *rgi, group_commit_orderer *gco,
 }
 
 
-static void
+static bool
 do_ftwrl_wait(rpl_group_info *rgi,
  bool *did_enter_cond, PSI_stage_info *old_stage)
 {
  THD *thd= rgi->thd;
  rpl_parallel_entry *entry= rgi->parallel_entry;
  uint64 sub_id= rgi->gtid_sub_id;
+ bool aborted= false;
  DBUG_ENTER("do_ftwrl_wait");
 
  mysql_mutex_assert_owner(&entry->LOCK_parallel_entry);
@@ -407,7 +408,10 @@ do_ftwrl_wait(rpl_group_info *rgi,
  do
  {
  if (entry->force_abort || rgi->worker_error)
+ {
+ aborted= true;
  break;
+ }
  if (thd->check_killed())
  {
  thd->send_kill_message();
@@ -427,7 +431,7 @@ do_ftwrl_wait(rpl_group_info *rgi,
  if (sub_id > entry->largest_started_sub_id)
  entry->largest_started_sub_id= sub_id;
 
- DBUG_VOID_RETURN;
+ DBUG_RETURN(aborted);
 }
 
 
@@ -513,7 +517,22 @@ rpl_unpause_after_ftwrl(THD *thd)
  mysql_mutex_lock(&e->LOCK_parallel_entry);
  rpt->pause_for_ftwrl = false;
  mysql_mutex_unlock(&rpt->LOCK_rpl_thread);
- e->pause_sub_id= (uint64)ULONGLONG_MAX;
+ /*
+ Do not change pause_sub_id if force_abort is set.
+ force_abort is set in case of STOP SLAVE.
+
+ Reason: If pause_sub_id is not changed and force_abort_is set,
+ any parallel slave thread waiting in do_ftwrl_wait() will
+ on wakeup return from do_ftwrl_wait() with 1. This will set
+ skip_event_group to 1 in handle_rpl_parallel_thread() and the
+ parallel thread will abort at once.
+
+ If pause_sub_id is changed, the code in handle_rpl_parallel_thread()
+ would continue to execute the transaction in the queue, which would
+ cause some transactions to be lost.
+ */
+ if (!e->force_abort)
+ e->pause_sub_id= (uint64)ULONGLONG_MAX;
  mysql_cond_broadcast(&e->COND_parallel_entry);
  mysql_mutex_unlock(&e->LOCK_parallel_entry);
  }
@@ -1197,7 +1216,7 @@ handle_rpl_parallel_thread(void *arg)
  rgi->worker_error= 1;
  }
  if (likely(!skip_event_group))
- do_ftwrl_wait(rgi, &did_enter_cond, &old_stage);
+ skip_event_group= do_ftwrl_wait(rgi, &did_enter_cond, &old_stage);
 
  /*
  Register ourself to wait for the previous commit, if we need to do

sql/sql_admin.cc

@@ -776,7 +776,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
  */
  collect_eis=
  (table->table->s->table_category == TABLE_CATEGORY_USER &&
- !(lex->alter_info.flags &= Alter_info::ALTER_ADMIN_PARTITION) &&
+ !(lex->alter_info.flags & Alter_info::ALTER_ADMIN_PARTITION) &&
  (get_use_stat_tables_mode(thd) > NEVER ||
  lex->with_persistent_for_clause));
  }

storage/tokudb/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(TOKUDB_VERSION 5.6.41-84.1)
+SET(TOKUDB_VERSION 5.6.49-89.0)
 # PerconaFT only supports x86-64 and cmake-2.8.9+
 IF(WIN32)
  # tokudb never worked there
@@ -136,6 +136,7 @@ IF(DEFINED TOKUDB_NOPATCH_CONFIG)
  ADD_DEFINITIONS("-DTOKUDB_NOPATCH_CONFIG=${TOKUDB_NOPATCH_CONFIG}")
 ENDIF()
 
+MY_CHECK_AND_SET_COMPILER_FLAG(-Wno-missing-format-attribute)
 MY_CHECK_AND_SET_COMPILER_FLAG(-Wno-missing-field-initializers)
 
 IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/PerconaFT/")

storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake

@@ -47,20 +47,18 @@ include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 
 ## adds a compiler flag if the compiler supports it
-macro(set_cflags_if_supported)
+macro(prepend_cflags_if_supported)
  foreach(flag ${ARGN})
  MY_CHECK_AND_SET_COMPILER_FLAG(${flag})
  endforeach(flag)
-endmacro(set_cflags_if_supported)
+endmacro(prepend_cflags_if_supported)
 
 if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING)
  set (OPTIONAL_CFLAGS "${OPTIONAL_CFLAGS} -Wmissing-format-attribute")
 endif()
 
 ## disable some warnings
-## missing-format-attribute causes warnings in some MySQL include files
-## if the library is built as a part of TokuDB MySQL storage engine
-set_cflags_if_supported(
+prepend_cflags_if_supported(
  -Wno-missing-field-initializers
  -Wstrict-null-sentinel
  -Winit-self
@@ -77,7 +75,6 @@ set_cflags_if_supported(
  -fno-exceptions
  -Wno-error=nonnull-compare
  )
-## set_cflags_if_supported_named("-Weffc++" -Weffcpp)
 
 if (CMAKE_CXX_FLAGS MATCHES -fno-implicit-templates)
  # must append this because mysql sets -fno-implicit-templates and we need to override it
@@ -89,24 +86,18 @@ endif()
 
 ## Clang has stricter POD checks. So, only enable this warning on our other builds (Linux + GCC)
 if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
- set_cflags_if_supported(
+ prepend_cflags_if_supported(
  -Wpacked
  )
 endif ()
 
 option (PROFILING "Allow profiling and debug" ON)
 if (PROFILING)
- set_cflags_if_supported(
+ prepend_cflags_if_supported(
  -fno-omit-frame-pointer
  )
 endif ()
 
-## this hits with optimized builds somewhere in ftleaf_split, we don't
-## know why but we don't think it's a big deal
-set_cflags_if_supported(
- -Wno-error=strict-overflow
- )
-
 # new flag sets in MySQL 8.0 seem to explicitly disable this
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
 
@@ -144,7 +135,7 @@ else ()
 endif ()
 
 ## set warnings
-set_cflags_if_supported(
+prepend_cflags_if_supported(
  -Wextra
  -Wbad-function-cast
  -Wno-missing-noreturn
@@ -167,7 +158,7 @@ set_cflags_if_supported(
 
 if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang)
  # Disabling -Wcast-align with clang. TODO: fix casting and re-enable it, someday.
- set_cflags_if_supported(-Wcast-align)
+ prepend_cflags_if_supported(-Wcast-align)
 endif ()
 
 ## never want these

storage/tokudb/PerconaFT/ft/logger/logger.cc

@@ -51,6 +51,9 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
 #include "util/status.h"
 
 int writing_rollback = 0;
+extern "C" {
+ uint force_recovery = 0;
+}
 
 static const int log_format_version = TOKU_LOG_VERSION;
 

storage/tokudb/PerconaFT/ft/serialize/rbtree_mhs.h

@@ -193,6 +193,7 @@ namespace MhsRbTree {
  BlockPair(OUUInt64 o, OUUInt64 s) : _offset(o), _size(s) {}
  BlockPair(const BlockPair &o)
  : _offset(o._offset), _size(o._size) {}
+ BlockPair& operator=(const BlockPair&) = default;
 
  int operator<(const BlockPair &rhs) const {
  return _offset < rhs._offset;

storage/tokudb/PerconaFT/ft/tests/cachetable-simple-close.cc

@@ -195,13 +195,13 @@ static void test_multiple_cachefiles(bool use_same_hash) {
 
  char fname1[strlen(TOKU_TEST_FILENAME) + sizeof("_1")]; 
  strcpy(fname1, TOKU_TEST_FILENAME);
- strncat(fname1, "_1", sizeof("_1"));
+ strcat(fname1, "_1");
  char fname2[strlen(TOKU_TEST_FILENAME) + sizeof("_2")]; 
  strcpy(fname2, TOKU_TEST_FILENAME);
- strncat(fname2, "_2", sizeof("_2"));
+ strcat(fname2, "_2");
  char fname3[strlen(TOKU_TEST_FILENAME) + sizeof("_3")]; 
  strcpy(fname3, TOKU_TEST_FILENAME);
- strncat(fname3, "_3", sizeof("_3"));
+ strcat(fname3, "_3");
 
  unlink(fname1);
  unlink(fname2);
@@ -280,10 +280,10 @@ static void test_evictor(void) {
 
  char fname1[strlen(TOKU_TEST_FILENAME) + sizeof("_1")]; 
  strcpy(fname1, TOKU_TEST_FILENAME);
- strncat(fname1, "_1", sizeof("_1"));
+ strcat(fname1, "_1");
  char fname2[strlen(TOKU_TEST_FILENAME) + sizeof("_2")]; 
  strcpy(fname2, TOKU_TEST_FILENAME);
- strncat(fname2, "_2", sizeof("_2"));
+ strcat(fname2, "_2");
 
  unlink(fname1);
  unlink(fname2);