Skip to content

Commit 3e147a5

Browse files
author
Sergey Glukhov
committedNov 9, 2018
WL#11974 Remove MyISAM as the engine used for on-disk internal temporary tables.
1 parent c9818bb commit 3e147a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+174
-1003
lines changed
 

‎mysql-test/include/subquery_mat.inc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,20 +1544,13 @@ WHERE t1.a NOT IN (
15441544
set @save_heap_size= @@max_heap_table_size;
15451545
set @@max_heap_table_size= 16384;
15461546

1547-
# Test both disk-based engines:
1548-
set @saved_engine=@@internal_tmp_disk_storage_engine;
1549-
set global internal_tmp_disk_storage_engine = 'myisam';
1547+
# Test disk-based engine:
15501548

15511549
# Subq-materialization can be used and gives correct result:
15521550
eval EXPLAIN $query;
15531551
eval $query;
15541552

1555-
set global internal_tmp_disk_storage_engine = 'innodb';
1556-
eval EXPLAIN $query;
1557-
eval $query;
1558-
15591553
DROP TABLE t1;
1560-
set global internal_tmp_disk_storage_engine = @saved_engine;
15611554
set @@max_heap_table_size= @save_heap_size;
15621555

15631556
--echo #

‎mysql-test/include/with_non_recursive.inc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -804,12 +804,6 @@ with
804804

805805
drop table sales_days;
806806

807-
--echo # Tmp table cannot be MyISAM
808-
set global internal_tmp_disk_storage_engine=myisam;
809-
--error ER_SWITCH_TMP_ENGINE
810-
with qn as (select 1) select * from qn;
811-
set global internal_tmp_disk_storage_engine=default;
812-
813807
--echo # Special parser command not allowed to users.
814808
--error ER_PARSE_ERROR
815809
parse_cte ( select 1 ) ;

0 commit comments

Comments
 (0)