Merge branch '10.11' into bb-10.11-release

Author: sanja-byelkin

mysql-test/main/merge.result

@@ -3968,73 +3968,18 @@ a
 5
 DROP TABLE t1;
 #
-# End of 10.11 tests
-#
-#
-# MDEV-30088 Assertion `cond_selectivity <= 1.0' failed in get_range_limit_read_cost
-#
-CREATE TABLE t1 (a TIMESTAMP, KEY(a)) ENGINE=MRG_MyISAM;
-explain SELECT a, COUNT(*) FROM t1 WHERE a >= '2000-01-01 00:00:00' GROUP BY a;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-SELECT a, COUNT(*) FROM t1 WHERE a >= '2000-01-01 00:00:00' GROUP BY a;
-a	COUNT(*)
-DROP TABLE t1;
+# MDEV-39494 UBSAN failure
 #
-# MDEV-30525: Assertion `ranges > 0' fails in IO_AND_CPU_COST handler::keyread_time
+# This test was ported down from 11.x and was originally implemented under MDEV-30525.
+# Under 10.11, this scenario results in a divide-by-zero failure because there are zero
+# table records available.
 #
 CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
 CREATE TABLE t2 (a INT, KEY(a)) ENGINE=MyISAM;
 CREATE TABLE tm (a INT, KEY(a)) ENGINE=MRG_MyISAM UNION=(t1,t2);
 SELECT DISTINCT a FROM tm WHERE a > 50;
 a
 DROP TABLE tm, t1, t2;
-# Testcase 2:
-CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
-CREATE TABLE t2 (a INT, KEY(a)) ENGINE=MyISAM;
-CREATE TABLE tm (a INT, KEY(a)) ENGINE=MERGE UNION = (t1, t2) INSERT_METHOD=FIRST;
-ANALYZE TABLE tm PERSISTENT FOR ALL;
-Table	Op	Msg_type	Msg_text
-test.tm	analyze	status	Engine-independent statistics collected
-test.tm	analyze	note	The storage engine for the table doesn't support analyze
-SELECT DISTINCT a FROM (SELECT * FROM tm WHERE a iS NOT NULL) AS sq;
-a
-DROP TABLE tm, t1, t2;
-#
-# MDEV-30568 Assertion `cond_selectivity <= 1.000000001' failed in get_range_limit_read_cost
-#
-CREATE TABLE t1 (f INT, KEY(f)) ENGINE=MyISAM;
-CREATE TABLE t2 (f INT, KEY(f)) ENGINE=MyISAM;
-CREATE TABLE tm (f INT, KEY(f)) ENGINE=MERGE UNION = (t1, t2);
-SELECT DISTINCT f FROM tm WHERE f IN (47, 126, 97, 48, 73, 0);
-f
-DROP TABLE tm, t1, t2;
-#
-# MDEV-30786 SIGFPE in cost_group_min_max on EXP
-#
-SET use_stat_tables='preferably';
-CREATE TABLE t1 (a INT,b INT,KEY i1 (a),KEY i2 (b)) ENGINE=MRG_MyISAM;
-ANALYZE LOCAL TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	Engine-independent statistics collected
-test.t1	analyze	note	The storage engine for the table doesn't support analyze
-EXPLAIN SELECT DISTINCT a FROM t1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	NULL	i1	5	NULL	1	Using index for group-by
-drop table t1;
-set use_stat_tables=default;
-#
-# End of 11.0 tests
-#
-#
-# MDEV-29174: UPDATE of view that uses MERGE table
-#
-CREATE TABLE t1 (a int) ENGINE=MERGE;
-CREATE VIEW v1 AS SELECT a FROM t1;
-UPDATE v1 SET a=0;
-DROP VIEW v1;
-DROP TABLE t1;
-# End of 11.1 tests
 #
 # MDEV-38474 Double free or corruption, ASAN heap-use-after-free in st_join_table::cleanup
 #
@@ -4061,5 +4006,5 @@ UPDATE t1 STRAIGHT_JOIN t2 SET a = 89 WHERE 9 IN (SELECT c FROM t3 WHERE c IN (S
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 DROP TABLE t1, t2, t3, t4;
 #
-# End of 11.4 tests
+# End of 10.11 tests
 #

mysql-test/main/merge.test

@@ -2903,69 +2903,19 @@ EXECUTE nested;
 DROP TABLE t1;
 
 --echo #
---echo # End of 10.11 tests
---echo #
-
---echo #
---echo # MDEV-30088 Assertion `cond_selectivity <= 1.0' failed in get_range_limit_read_cost
---echo #
-
-CREATE TABLE t1 (a TIMESTAMP, KEY(a)) ENGINE=MRG_MyISAM;
-explain SELECT a, COUNT(*) FROM t1 WHERE a >= '2000-01-01 00:00:00' GROUP BY a;
-SELECT a, COUNT(*) FROM t1 WHERE a >= '2000-01-01 00:00:00' GROUP BY a;
-DROP TABLE t1;
-
+--echo # MDEV-39494 UBSAN failure
 --echo #
---echo # MDEV-30525: Assertion `ranges > 0' fails in IO_AND_CPU_COST handler::keyread_time
+--echo # This test was ported down from 11.x and was originally implemented under MDEV-30525.
+--echo # Under 10.11, this scenario results in a divide-by-zero failure because there are zero
+--echo # table records available.
 --echo #
 CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
 CREATE TABLE t2 (a INT, KEY(a)) ENGINE=MyISAM;
 CREATE TABLE tm (a INT, KEY(a)) ENGINE=MRG_MyISAM UNION=(t1,t2);
+# Must have zero records to produce UBSAN failure on divide-by-zero.
 SELECT DISTINCT a FROM tm WHERE a > 50;
 DROP TABLE tm, t1, t2;
 
---echo # Testcase 2:
-CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
-CREATE TABLE t2 (a INT, KEY(a)) ENGINE=MyISAM;
-CREATE TABLE tm (a INT, KEY(a)) ENGINE=MERGE UNION = (t1, t2) INSERT_METHOD=FIRST;
-ANALYZE TABLE tm PERSISTENT FOR ALL;
-SELECT DISTINCT a FROM (SELECT * FROM tm WHERE a iS NOT NULL) AS sq;
-DROP TABLE tm, t1, t2;
-
---echo #
---echo # MDEV-30568 Assertion `cond_selectivity <= 1.000000001' failed in get_range_limit_read_cost
---echo #
-CREATE TABLE t1 (f INT, KEY(f)) ENGINE=MyISAM;
-CREATE TABLE t2 (f INT, KEY(f)) ENGINE=MyISAM;
-CREATE TABLE tm (f INT, KEY(f)) ENGINE=MERGE UNION = (t1, t2);
-SELECT DISTINCT f FROM tm WHERE f IN (47, 126, 97, 48, 73, 0);
-DROP TABLE tm, t1, t2;
-
---echo #
---echo # MDEV-30786 SIGFPE in cost_group_min_max on EXP
---echo #
-SET use_stat_tables='preferably';
-CREATE TABLE t1 (a INT,b INT,KEY i1 (a),KEY i2 (b)) ENGINE=MRG_MyISAM;
-ANALYZE LOCAL TABLE t1;
-EXPLAIN SELECT DISTINCT a FROM t1;
-drop table t1;
-set use_stat_tables=default;
-
---echo #
---echo # End of 11.0 tests
---echo #
---echo #
---echo # MDEV-29174: UPDATE of view that uses MERGE table
---echo #
-
-CREATE TABLE t1 (a int) ENGINE=MERGE;
-CREATE VIEW v1 AS SELECT a FROM t1;
-UPDATE v1 SET a=0;
-DROP VIEW v1;
-DROP TABLE t1;
-
---echo # End of 11.1 tests
-
 --echo #
 --echo # MDEV-38474 Double free or corruption, ASAN heap-use-after-free in st_join_table::cleanup
 --echo #
@@ -2997,6 +2947,5 @@ UPDATE t1 STRAIGHT_JOIN t2 SET a = 89 WHERE 9 IN (SELECT c FROM t3 WHERE c IN (S
 DROP TABLE t1, t2, t3, t4;
 
 --echo #
---echo # End of 11.4 tests
+--echo # End of 10.11 tests
 --echo #
-

sql/opt_range.cc

@@ -15071,8 +15071,16 @@ void cost_group_min_max(TABLE* table, KEY *index_info, uint used_key_parts,
     keys_per_group= (table_records / 10) + 1;
   num_groups= (table_records / keys_per_group) + 1;
 
-  /* Apply the selectivity of the quick select for group prefixes. */
-  if (range_tree && (quick_prefix_records != HA_POS_ERROR))
+  DBUG_ASSERT(keys_per_group > 0);
+  DBUG_ASSERT(num_groups > 0);
+
+  /*
+    Apply the selectivity of the quick select for group prefixes.
+
+    If there are no records in the table, then there's nothing to select so
+    let num_groups continue to be 1 as set above.
+  */
+  if (range_tree && (quick_prefix_records != HA_POS_ERROR) && table_records > 0)
   {
     quick_prefix_selectivity= (double) quick_prefix_records /
                               (double) table_records;

storage/innobase/buf/buf0flu.cc

@@ -1966,6 +1966,7 @@ inline void log_t::write_checkpoint(lsn_t checkpoint, lsn_t end_lsn) noexcept
 static void log_checkpoint_low(lsn_t oldest_lsn, lsn_t end_lsn) noexcept
 {
   ut_ad(!srv_read_only_mode);
+  ut_ad(!recv_no_log_write);
   ut_ad(log_sys.latch_have_wr());
   ut_ad(oldest_lsn <= end_lsn);
   ut_ad(end_lsn == log_sys.get_lsn());
@@ -2550,6 +2551,11 @@ static void buf_flush_page_cleaner() noexcept
       {
         if (recv_recovery_is_on())
           continue;
+#ifdef WITH_WSREP
+        extern Atomic_relaxed<bool> wsrep_sst_disable_writes;
+        if (UNIV_UNLIKELY(wsrep_sst_disable_writes))
+          continue; /* See sst_disable_innodb_writes() */
+#endif
         IF_DBUG(if (log_sys.last_checkpoint_lsn &&
                     srv_shutdown_state < SRV_SHUTDOWN_CLEANUP &&
                     (_db_keyword_(nullptr, "ib_log_checkpoint_avoid", 1) ||

storage/innobase/fts/fts0opt.cc

@@ -37,13 +37,6 @@ Completed 2011/7/10 Sunny and Jimmy Yang
 #include "zlib.h"
 #include "fts0opt.h"
 #include "fts0vlc.h"
-#include "wsrep.h"
-
-#ifdef WITH_WSREP
-extern Atomic_relaxed<bool> wsrep_sst_disable_writes;
-#else
-constexpr bool wsrep_sst_disable_writes= false;
-#endif
 
 /** The FTS optimize thread's work queue. */
 ib_wqueue_t* fts_optimize_wq;
@@ -52,7 +45,7 @@ static void timer_callback(void*);
 static tpool::timer* timer;
 
 static tpool::task_group task_group(1);
-static tpool::task task(fts_optimize_callback,0, &task_group);
+static tpool::waitable_task task(fts_optimize_callback,0, &task_group);
 
 /** FTS optimize thread, for MDL acquisition */
 static THD *fts_opt_thd;
@@ -230,7 +223,7 @@ ulong	fts_num_word_optimize;
 char	fts_enable_diag_print;
 
 /** ZLib compressed block size.*/
-static ulint FTS_ZIP_BLOCK_SIZE	= 1024;
+static constexpr ulint FTS_ZIP_BLOCK_SIZE = 1024;
 
 /** The amount of time optimizing in a single pass, in seconds. */
 static ulint fts_optimize_time_limit;
@@ -2831,6 +2824,10 @@ static void fts_optimize_callback(void *)
 	static ulint		n_tables = ib_vector_size(fts_slots);
 
 	while (!done && srv_shutdown_state <= SRV_SHUTDOWN_INITIATED) {
+#ifdef WITH_WSREP
+		ut_d(extern Atomic_relaxed<bool> wsrep_sst_disable_writes);
+		ut_ad(!wsrep_sst_disable_writes);
+#endif
 		/* If there is no message in the queue and we have tables
 		to optimize then optimize the tables. */
 
@@ -2841,17 +2838,6 @@ static void fts_optimize_callback(void *)
 
 			/* The queue is empty but we have tables
 			to optimize. */
-			if (UNIV_UNLIKELY(wsrep_sst_disable_writes)) {
-retry_later:
-				if (fts_is_sync_needed()) {
-					fts_need_sync = true;
-				}
-				if (n_tables) {
-					timer->set_time(5000, 0);
-				}
-				return;
-			}
-
 			fts_slot_t* slot = static_cast<fts_slot_t*>(
 				ib_vector_get(fts_slots, current));
 
@@ -2872,7 +2858,13 @@ static void fts_optimize_callback(void *)
 				(ib_wqueue_nowait(fts_optimize_wq));
 			/* Timeout ? */
 			if (!msg) {
-				goto retry_later;
+				if (fts_is_sync_needed()) {
+					fts_need_sync = true;
+				}
+				if (n_tables) {
+					timer->set_time(5000, 0);
+				}
+				return;
 			}
 
 			switch (msg->type) {
@@ -2898,11 +2890,6 @@ static void fts_optimize_callback(void *)
 				break;
 
 			case FTS_MSG_SYNC_TABLE:
-				if (UNIV_UNLIKELY(wsrep_sst_disable_writes)) {
-					add_msg(msg);
-					goto retry_later;
-				}
-
 				DBUG_EXECUTE_IF(
 					"fts_instrument_msg_sync_sleep",
 					std::this_thread::sleep_for(
@@ -2945,11 +2932,8 @@ static void fts_optimize_callback(void *)
 	ib::info() << "FTS optimize thread exiting.";
 }
 
-/**********************************************************************//**
-Startup the optimize thread and create the work queue. */
-void
-fts_optimize_init(void)
-/*===================*/
+/** Startup the optimize task and create the work queue. */
+void fts_optimize_init()
 {
 	mem_heap_t*	heap;
 	ib_alloc_t*     heap_alloc;
@@ -2993,9 +2977,8 @@ fts_optimize_init(void)
 	last_check_sync_time = time(NULL);
 }
 
-/** Shutdown fts optimize thread. */
-void
-fts_optimize_shutdown()
+/** Shut down the fts optimize thread. */
+void fts_optimize_shutdown()
 {
 	ut_ad(!srv_read_only_mode);
 
@@ -3004,7 +2987,7 @@ fts_optimize_shutdown()
 	dict_sys.freeze(SRW_LOCK_CALL);
 	mysql_mutex_lock(&fts_optimize_wq->mutex);
 	/* Tells FTS optimizer system that we are exiting from
-	optimizer thread, message send their after will not be
+	optimizer thread, messages sent thereafter will not be
 	processed */
 	fts_opt_start_shutdown = true;
 	dict_sys.unfreeze();
@@ -3034,6 +3017,26 @@ fts_optimize_shutdown()
 	timer = NULL;
 }
 
+#ifdef WITH_WSREP
+/** Pause the optimize subsystem. */
+void fts_optimize_pause()
+{
+  ut_ad(!srv_read_only_mode);
+  /* Prevent fts_optimize_callback() from being scheduled. */
+  timer->disarm();
+  /* Wait for any current fts_optimize_callback() to finish. */
+  task.wait();
+}
+
+/** Resume after fts_optimize_stop() */
+void fts_optimize_resume()
+{
+  /* Schedule fts_optimize_callback() immediately.
+  It will reschedule itself via the timer when needed. */
+  srv_thread_pool->submit_task(&task);
+}
+#endif
+
 /** Sync the table during commit phase
 @param[in]	table	table to be synced */
 void fts_sync_during_ddl(dict_table_t* table)

storage/innobase/handler/ha_innodb.cc

@@ -1779,9 +1779,10 @@ static void sst_disable_innodb_writes()
   fil_crypt_set_thread_cnt(0);
   srv_n_fil_crypt_threads= old_count;
 
-  wsrep_sst_disable_writes= true;
   dict_stats_shutdown();
+  fts_optimize_pause();
   purge_sys.stop();
+
   /* We are holding a global MDL thanks to FLUSH TABLES WITH READ LOCK.
 
   That will prevent any writes from arriving into InnoDB, but it will
@@ -1793,10 +1794,12 @@ static void sst_disable_innodb_writes()
   possible during the snapshot, and to guarantee that no crash
   recovery will be necessary when starting up on the snapshot. */
   log_make_checkpoint();
+  wsrep_sst_disable_writes= true;
   /* If any FILE_MODIFY records were written by the checkpoint, an
   extra write of a FILE_CHECKPOINT record could still be invoked by
-  buf_flush_page_cleaner(). Let us prevent that by invoking another
-  checkpoint (which will write the FILE_CHECKPOINT record). */
+  buf_flush_page_cleaner(). Let us ensure that the page cleaner
+  is idle and will observe our above assignment (not write anything
+  further to the log). */
   log_make_checkpoint();
   ut_d(recv_no_log_write= true);
   /* If this were not a no-op, an assertion would fail due to
@@ -1811,6 +1814,8 @@ static void sst_enable_innodb_writes()
   dict_stats_start();
   purge_sys.resume();
   wsrep_sst_disable_writes= false;
+  /* Allow fts_optimize_callback() to assert that the flag is clear. */
+  fts_optimize_resume();
   const uint old_count= srv_n_fil_crypt_threads;
   srv_n_fil_crypt_threads= 0;
   fil_crypt_set_thread_cnt(old_count);