mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Sergey Petrunya 2014-01-24 23:44:52 +04:00
commit c6de45584a
3 changed files with 54 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
mysql-test/r/innodb_icp.result
View file

@ -907,5 +907,30 @@ OR a = c
ORDER BY e;
a b c d e
DROP TABLE t1,t2,t3;
#
# MDEV-5337: Wrong result in mariadb 5.5.32 with ORDER BY + LIMIT when index_condition_pushdown=on
# MDEV-5512: Wrong result (WHERE clause ignored) with multiple clauses using Percona-XtraDB engine
#
create table t1(a int);
insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t2 (pk int primary key,
key1 char(32),
key2 char(32),
key(key1),
key(key2)
) engine=innodb;
insert into t2 select
A.a+10*B.a+100*C.a,
concat('rare-', A.a+10*B.a),
concat('rare-', A.a+10*B.a)
from
t1 A, t1 B, t1 C;
update t2 set key1='frequent-val' where pk between 100 and 350;
select * from t2 ignore key(PRIMARY)
where key1='frequent-val' and key2 between 'rare-400' and 'rare-450' order by pk limit 2;
pk key1 key2
141 frequent-val rare-41
142 frequent-val rare-42
drop table t1, t2;
set optimizer_switch=@innodb_icp_tmp;
set storage_engine= @save_storage_engine;

28
mysql-test/t/innodb_icp.test
View file

@ -45,6 +45,34 @@ ORDER BY e;
DROP TABLE t1,t2,t3;
--echo #
--echo # MDEV-5337: Wrong result in mariadb 5.5.32 with ORDER BY + LIMIT when index_condition_pushdown=on
--echo # MDEV-5512: Wrong result (WHERE clause ignored) with multiple clauses using Percona-XtraDB engine
--echo #
create table t1(a int);
insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t2 (pk int primary key,
key1 char(32),
key2 char(32),
key(key1),
key(key2)
) engine=innodb;
insert into t2 select
A.a+10*B.a+100*C.a,
concat('rare-', A.a+10*B.a),
concat('rare-', A.a+10*B.a)
from
t1 A, t1 B, t1 C;
update t2 set key1='frequent-val' where pk between 100 and 350;
select * from t2 ignore key(PRIMARY)
where key1='frequent-val' and key2 between 'rare-400' and 'rare-450' order by pk limit 2;
drop table t1, t2;
set optimizer_switch=@innodb_icp_tmp;
set storage_engine= @save_storage_engine;

2
sql/sql_select.cc
View file

@ -19479,7 +19479,7 @@ check_reverse_order:
table->disable_keyread();
}
}
else if (tab->type != JT_ALL)
else if (tab->type != JT_ALL || tab->select->quick)
{
/*
We're about to use a quick access to the table.