Skip to content

Commit 3e147a5

Browse files
author
Sergey Glukhov
committed
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 ) ;

mysql-test/r/all_persisted_variables.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ include/assert.inc ['Expect 554 variables in the table. Due to open Bugs, we are
4242

4343
# Test SET PERSIST
4444

45-
include/assert.inc [Expect 362 persisted variables in the table. Due to open Bugs, we are checking for 357]
45+
include/assert.inc [Expect 361 persisted variables in the table. Due to open Bugs, we are checking for 356]
4646

4747
************************************************************
4848
* 3. Restart server, it must preserve the persisted variable
4949
* settings. Verify persisted configuration.
5050
************************************************************
5151
# restart
5252

53-
include/assert.inc [Expect 357 persisted variables in persisted_variables table.]
54-
include/assert.inc [Expect 357 persisted variables shown as PERSISTED in variables_info table.]
55-
include/assert.inc [Expect 357 persisted variables with matching peristed and global values.]
53+
include/assert.inc [Expect 356 persisted variables in persisted_variables table.]
54+
include/assert.inc [Expect 356 persisted variables shown as PERSISTED in variables_info table.]
55+
include/assert.inc [Expect 356 persisted variables with matching peristed and global values.]
5656

5757
************************************************************
5858
* 4. Test RESET PERSIST IF EXISTS. Verify persisted variable

mysql-test/r/derived.result

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4046,17 +4046,6 @@ alias2
40464046
1
40474047
DROP TABLE t1;
40484048
#
4049-
# Bug#25907510 CRASH IN HA_MYISAM::IDX_COND_PUSH WITH INTERNAL_TMP_DISK_STORAGE_ENGINE=MYISAM
4050-
#
4051-
set global internal_tmp_disk_storage_engine=myisam;
4052-
create table t (a bit(1),b int) engine=innodb;
4053-
create table s (a int) engine=innodb;
4054-
select 1 from t natural right outer join
4055-
(select a,@q from s limit 2) w where b;
4056-
1
4057-
drop table t,s;
4058-
set global internal_tmp_disk_storage_engine=default;
4059-
#
40604049
# Bug#26596977: ASSERT `!(USED_TABS & (~READ_TABLES & ~FILTER_FOR_TABLE))'
40614050
# FAILED IN ITEM_FUNC
40624051
#

mysql-test/r/fulltext_order_by.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,15 @@ where
166166
match(c.beitrag) against ('+abc' in boolean mode)
167167
order by
168168
match(betreff) against ('+abc' in boolean mode) desc;
169-
text id betreff
169+
ERROR HY000: The used table type doesn't support FULLTEXT indexes
170170
(select b.id, b.betreff from t3 b) union
171171
(select b.id, b.betreff from t3 b)
172172
order by match(betreff) against ('+abc' in boolean mode) desc;
173-
id betreff
173+
ERROR HY000: The used table type doesn't support FULLTEXT indexes
174174
(select b.id, b.betreff from t3 b) union
175175
(select b.id, b.betreff from t3 b)
176176
order by match(betreff) against ('+abc') desc;
177-
ERROR HY000: Can't find FULLTEXT index matching the column list
177+
ERROR HY000: The used table type doesn't support FULLTEXT indexes
178178
select distinct b.id, b.betreff from t3 b
179179
order by match(betreff) against ('+abc' in boolean mode) desc;
180180
id betreff

mysql-test/r/insert_select.result

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -838,23 +838,6 @@ Table Op Msg_type Msg_text
838838
test.t2 check status OK
839839
drop table t1,t2;
840840
##################################################################
841-
#
842-
# Bug #46075: Assertion failed: 0, file .\protocol.cc, line 416
843-
#
844-
set global internal_tmp_disk_storage_engine = 'myisam';
845-
set session internal_tmp_mem_storage_engine = 'memory';
846-
CREATE TABLE t1(a INT);
847-
SET max_heap_table_size = 16384;
848-
SET @old_myisam_data_pointer_size = @@myisam_data_pointer_size;
849-
SET GLOBAL myisam_data_pointer_size = 2;
850-
INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
851-
call mtr.add_suppression("\\[MY-\\d+.*\\] The table '.*#sql.*' is full");
852-
INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7;
853-
Got one of the listed errors
854-
set session internal_tmp_mem_storage_engine = default;
855-
set global internal_tmp_disk_storage_engine = InnoDB;
856-
SET GLOBAL myisam_data_pointer_size = @old_myisam_data_pointer_size;
857-
DROP TABLE t1;
858841
End of 5.0 tests
859842
#
860843
# Bug #21441405: DASH '-' IS NOT RECOGNIZED IN CHARSET

0 commit comments

Comments
 (0)