Skip to content

Commit 40b9b98

Browse files
committed
Removed wrongly placed test from group_min_max.test
This is mainly done to be able to push to 11.0 The test is moved in 10.6 to another file, which will add back the test.
1 parent ccc48b4 commit 40b9b98

File tree

2 files changed

+1
-49
lines changed

2 files changed

+1
-49
lines changed

mysql-test/main/group_min_max.result

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4238,30 +4238,6 @@ a b s1
42384238
2 2 t2:t2a-null;min_t3_b:t3b-null
42394239
3 3 t2:1;min_t3_b:3
42404240
drop table t1,t2,t3;
4241-
#
4242-
# MDEV-31380: Assertion `s->table->opt_range_condition_rows <= s->found_records' failed
4243-
# (assertion in 10.6+, DBL_MAX costs in 10.5)
4244-
#
4245-
CREATE TABLE t1 (a INT, b INT, PRIMARY KEY(a), KEY(b)) ENGINE=InnoDB;
4246-
INSERT INTO t1 SELECT seq, seq FROM seq_1_to_100;
4247-
SET
4248-
@tmp=@@optimizer_use_condition_selectivity,
4249-
optimizer_use_condition_selectivity = 1,
4250-
@tmp2=@@optimizer_trace,
4251-
optimizer_trace=1;
4252-
SELECT DISTINCT * FROM t1 WHERE a IN (1, 2);
4253-
a b
4254-
1 1
4255-
2 2
4256-
select
4257-
CAST(json_value(json_extract(trace, '$**.chosen_access_method.cost'), '$[0]')
4258-
as DOUBLE) < 1.0e100
4259-
from information_schema.optimizer_trace;
4260-
CAST(json_value(json_extract(trace, '$**.chosen_access_method.cost'), '$[0]')
4261-
as DOUBLE) < 1.0e100
4262-
1
4263-
set optimizer_use_condition_selectivity = @tmp, optimizer_trace=@tmp2;
4264-
drop table t1;
42654241
#
42664242
# End of 10.5 tests
42674243
#

mysql-test/main/group_min_max.test

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
--source include/default_optimizer_switch.inc
88
--source include/have_sequence.inc
99
--source include/have_innodb.inc
10-
--source include/have_sequence.inc
10+
1111
#
1212
# TODO:
1313
# Add queries with:
@@ -1867,30 +1867,6 @@ from t1;
18671867

18681868
drop table t1,t2,t3;
18691869

1870-
--echo #
1871-
--echo # MDEV-31380: Assertion `s->table->opt_range_condition_rows <= s->found_records' failed
1872-
--echo # (assertion in 10.6+, DBL_MAX costs in 10.5)
1873-
--echo #
1874-
1875-
CREATE TABLE t1 (a INT, b INT, PRIMARY KEY(a), KEY(b)) ENGINE=InnoDB;
1876-
INSERT INTO t1 SELECT seq, seq FROM seq_1_to_100;
1877-
1878-
SET
1879-
@tmp=@@optimizer_use_condition_selectivity,
1880-
optimizer_use_condition_selectivity = 1,
1881-
@tmp2=@@optimizer_trace,
1882-
optimizer_trace=1;
1883-
1884-
SELECT DISTINCT * FROM t1 WHERE a IN (1, 2);
1885-
1886-
select
1887-
CAST(json_value(json_extract(trace, '$**.chosen_access_method.cost'), '$[0]')
1888-
as DOUBLE) < 1.0e100
1889-
from information_schema.optimizer_trace;
1890-
1891-
set optimizer_use_condition_selectivity = @tmp, optimizer_trace=@tmp2;
1892-
drop table t1;
1893-
18941870
--echo #
18951871
--echo # End of 10.5 tests
18961872
--echo #

0 commit comments

Comments
 (0)