Bug #30471809: SERVER CRASH WITH SELECT FROM INFORMATION SCHEMA TABLES

Remove the hash_join=off optimizer switch; it causes problems with certain
information schema views, and it will go away anyway shortly, when the
pre-iterator executor (and thus also BNL) is removed.

Change-Id: I3779fbc6be57e7fcf6533a32d538cabf3941e5f4

Author: Steinar H. Gunderson

mysql-test/r/hash_join.result

@@ -916,38 +916,6 @@ SET join_buffer_size = 1024;
 SELECT STRAIGHT_JOIN COUNT(*) FROM t1 JOIN t2 ON t1.col1 = t2.col1;
 DROP TABLE t1, t2;
 SET join_buffer_size = DEFAULT;
-# See that the hints for hash join works as expected.
-CREATE TABLE t1 (col1 INTEGER);
-CREATE TABLE t2 (col1 INTEGER);
-# By default, hash join should be used.
-EXPLAIN FORMAT=tree SELECT t1.col1 FROM t1, t2;
-EXPLAIN
--> Inner hash join  (cost=0.70 rows=1)
-    -> Table scan on t2  (cost=0.35 rows=1)
-    -> Hash
-        -> Table scan on t1  (cost=0.35 rows=1)
-
-# Try disabling hash join using the hint.
-EXPLAIN FORMAT=tree SELECT /*+ NO_HASH_JOIN(t1, t2) */ t1.col1 FROM t1, t2;
-EXPLAIN
-<not executable by iterator executor>
-
-# Turn off hash join using the optimizer switch, and then enable it again
-# using the hint.
-SET optimizer_switch="hash_join=off";
-EXPLAIN FORMAT=tree SELECT t1.col1 FROM t1, t2;
-EXPLAIN
-<not executable by iterator executor>
-
-EXPLAIN FORMAT=tree SELECT /*+ HASH_JOIN(t1, t2) */ t1.col1 FROM t1, t2;
-EXPLAIN
--> Inner hash join  (cost=0.70 rows=1)
-    -> Table scan on t2  (cost=0.35 rows=1)
-    -> Hash
-        -> Table scan on t1  (cost=0.35 rows=1)
-
-SET optimizer_switch=DEFAULT;
-DROP TABLE t1, t2;
 #
 # Bug#29964536 WL#2241: ASSERTION FAILURE IN
 #              TEMPTABLE::HANDLER::POSITION() AT SRC/HANDLER.CC

mysql-test/r/kill.result

@@ -53,7 +53,7 @@ INSERT INTO t2 SELECT id FROM t1;
 SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
 SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync';
 SELECT id FROM t1 WHERE id IN
-(SELECT /*+ NO_HASH_JOIN(a,b,c,d) */ DISTINCT a.id FROM t2 a, t2 b, t2 c, t2 d
+(SELECT /*+ NO_BNL(a,b,c,d) */ DISTINCT a.id FROM t2 a, t2 b, t2 c, t2 d
 GROUP BY ACOS(1/a.id), b.id, c.id, d.id
 HAVING a.id BETWEEN 10 AND 20);
 SET DEBUG_SYNC= 'now WAIT_FOR in_sync';

mysql-test/r/temptable_disk.result

@@ -49,7 +49,7 @@ SET @@global.temptable_use_mmap = true;
 SELECT @@global.temptable_use_mmap;
 @@global.temptable_use_mmap
 1
-CREATE TABLE t (c VARCHAR(128));
+CREATE TABLE t (c LONGBLOB);
 INSERT INTO t VALUES
 (REPEAT('a', 128)),
 (REPEAT('b', 128)),
@@ -59,10 +59,7 @@ ANALYZE TABLE t;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
 SET GLOBAL temptable_max_ram = 2097152;
-# Disable hash join, since that will trigger the new execution engine,
-# which in turn won't do the temporary materialization needed to trigger
-# overflow to disk.
-SELECT /*+ NO_HASH_JOIN(t1, t2, t3, t4, t5, t6) */ * FROM
+SELECT * FROM
 t AS t1,
 t AS t2,
 t AS t3,

mysql-test/r/temptable_fallback.result

@@ -1,7 +1,7 @@
-# Disable hash join for this test, as it will trigger the new executor.
-# The new executor will enable the StreamingIterator in many of the test
-# cases, resulting in fewer materializations.
-SET optimizer_switch="hash_join=off";
+# Disable sorting by addon fields, as that will enable the
+# StreamingIterator in many of the test cases, resulting in
+# fewer materializations.
+SET debug = '+d,filesort_force_sort_row_ids';
 CREATE TABLE t (c VARCHAR(128));
 INSERT INTO t VALUES
 (REPEAT('a', 128)),

mysql-test/t/hash_join.test

@@ -649,24 +649,6 @@ eval $query;
 DROP TABLE t1, t2;
 SET join_buffer_size = DEFAULT;
 
---echo # See that the hints for hash join works as expected.
-CREATE TABLE t1 (col1 INTEGER);
-CREATE TABLE t2 (col1 INTEGER);
-
---echo # By default, hash join should be used.
-EXPLAIN FORMAT=tree SELECT t1.col1 FROM t1, t2;
-
---echo # Try disabling hash join using the hint.
-EXPLAIN FORMAT=tree SELECT /*+ NO_HASH_JOIN(t1, t2) */ t1.col1 FROM t1, t2;
-
---echo # Turn off hash join using the optimizer switch, and then enable it again
---echo # using the hint.
-SET optimizer_switch="hash_join=off";
-EXPLAIN FORMAT=tree SELECT t1.col1 FROM t1, t2;
-EXPLAIN FORMAT=tree SELECT /*+ HASH_JOIN(t1, t2) */ t1.col1 FROM t1, t2;
-SET optimizer_switch=DEFAULT;
-DROP TABLE t1, t2;
-
 --echo #
 --echo # Bug#29964536 WL#2241: ASSERTION FAILURE IN
 --echo #              TEMPTABLE::HANDLER::POSITION() AT SRC/HANDLER.CC

mysql-test/t/kill.test

@@ -129,7 +129,7 @@ SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync';
 # 'before_acos_function', because the hash join iterator will materialize a lot
 # of data before we get so far.
 send SELECT id FROM t1 WHERE id IN
-       (SELECT /*+ NO_HASH_JOIN(a,b,c,d) */ DISTINCT a.id FROM t2 a, t2 b, t2 c, t2 d
+       (SELECT /*+ NO_BNL(a,b,c,d) */ DISTINCT a.id FROM t2 a, t2 b, t2 c, t2 d
           GROUP BY ACOS(1/a.id), b.id, c.id, d.id
           HAVING a.id BETWEEN 10 AND 20);
 

mysql-test/t/temptable_disk.test

@@ -69,7 +69,7 @@ SELECT @@global.temptable_use_mmap;
 # Test TempTable overflow to disk
 #
 
-CREATE TABLE t (c VARCHAR(128));
+CREATE TABLE t (c LONGBLOB);  # Forces use of temporary table in filesort.
 
 INSERT INTO t VALUES
 (REPEAT('a', 128)),
@@ -81,10 +81,7 @@ ANALYZE TABLE t;
 
 SET GLOBAL temptable_max_ram = 2097152;
 -- disable_result_log
---echo # Disable hash join, since that will trigger the new execution engine,
---echo # which in turn won't do the temporary materialization needed to trigger
---echo # overflow to disk.
-SELECT /*+ NO_HASH_JOIN(t1, t2, t3, t4, t5, t6) */ * FROM
+SELECT * FROM
 t AS t1,
 t AS t2,
 t AS t3,

mysql-test/t/temptable_fallback.test

@@ -8,10 +8,10 @@
 # Prepare
 #
 
---echo # Disable hash join for this test, as it will trigger the new executor.
---echo # The new executor will enable the StreamingIterator in many of the test
---echo # cases, resulting in fewer materializations.
-SET optimizer_switch="hash_join=off";
+--echo # Disable sorting by addon fields, as that will enable the
+--echo # StreamingIterator in many of the test cases, resulting in
+--echo # fewer materializations.
+SET debug = '+d,filesort_force_sort_row_ids';
 
 CREATE TABLE t (c VARCHAR(128));
 

sql/filesort.cc

@@ -167,6 +167,11 @@ void Sort_param::decide_addon_fields(Filesort *file_sort, TABLE *table,
     return;
   }
 
+  DBUG_EXECUTE_IF("filesort_force_sort_row_ids", {
+    m_addon_fields_status = Addon_fields_status::keep_rowid;
+    return;
+  });
+
   // Generally, prefer using addon fields (ie., sorting rows instead of just
   // row IDs) if we can.
   //

sql/sql_join_buffer.cc

@@ -674,12 +674,6 @@ int JOIN_CACHE_BNL::init() {
 }
 
 bool JOIN_CACHE_BNL::can_be_replaced_with_hash_join() const {
-  if (!hint_table_state(join->thd, qep_tab->table_ref, HASH_JOIN_HINT_ENUM,
-                        OPTIMIZER_SWITCH_HASH_JOIN)) {
-    // Disabled by optimizer switch.
-    return false;
-  }
-
   if (qep_tab->last_inner() != NO_PLAN_IDX) {
     // Outer join.
     return false;