1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge fix for BUG#920132

Browse Source
This commit is contained in:
Sergey Petrunya 2012-02-22 12:21:54 +04:00
commit 925942e7af
3 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mysql-test/r/innodb_icp.result
View File

@ -835,5 +835,34 @@ Variable_name Value
Handler_pushed_index_cond_checks 2
Handler_pushed_index_cond_filtered 1
DROP TABLE t1;
#
# BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050
#
CREATE TABLE t1 ( a INT )
ENGINE=InnoDB;
INSERT INTO t1 VALUES (7),(7);
CREATE TABLE t2 ( b VARCHAR(1) );
INSERT INTO t2 VALUES ('j'),('v');
CREATE TABLE t3 (
c INT, d VARCHAR(1), e VARCHAR(1),
KEY (d,c)
) ENGINE=InnoDB;
INSERT INTO t3
VALUES (6,'w','w'),
(1,'v','v'),(7,'s','s'),(4,'l','l'),
(7,'y','y'),(0,'c','c'),(2,'i','i'),
(9,'h','h'),(4,'q','q'),(0,'a','a'),
(9,'v','v'),(1,'u','u'),(3,'s','s'),
(8,'z','z'),(1,'h','h'),(8,'p','p'),
(6,'e','e'),(3,'i','i'),(6,'y','y');
SELECT *
FROM t1 INNER JOIN t2 INNER JOIN t3
ON d = b
WHERE
NOT EXISTS ( SELECT * FROM t3 )
OR a = c
ORDER BY e;
a b c d e
DROP TABLE t1,t2,t3;
set optimizer_switch=@innodb_icp_tmp;
set storage_engine= @save_storage_engine;

33
mysql-test/t/innodb_icp.test
View File

@ -12,6 +12,39 @@ set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
--source include/icp_tests.inc
--echo #
--echo # BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050
--echo #
CREATE TABLE t1 ( a INT )
ENGINE=InnoDB;
INSERT INTO t1 VALUES (7),(7);
CREATE TABLE t2 ( b VARCHAR(1) );
INSERT INTO t2 VALUES ('j'),('v');
CREATE TABLE t3 (
c INT, d VARCHAR(1), e VARCHAR(1),
KEY (d,c)
) ENGINE=InnoDB;
INSERT INTO t3
VALUES (6,'w','w'),
(1,'v','v'),(7,'s','s'),(4,'l','l'),
(7,'y','y'),(0,'c','c'),(2,'i','i'),
(9,'h','h'),(4,'q','q'),(0,'a','a'),
(9,'v','v'),(1,'u','u'),(3,'s','s'),
(8,'z','z'),(1,'h','h'),(8,'p','p'),
(6,'e','e'),(3,'i','i'),(6,'y','y');
SELECT *
FROM t1 INNER JOIN t2 INNER JOIN t3
ON d = b
WHERE
NOT EXISTS ( SELECT * FROM t3 )
OR a = c
ORDER BY e;
DROP TABLE t1,t2,t3;
set optimizer_switch=@innodb_icp_tmp;
set storage_engine= @save_storage_engine;

6
sql/item.h
View File

@ -3901,6 +3901,12 @@ public:
return example->is_expensive_processor(arg);
}
virtual void set_null();
bool walk(Item_processor processor, bool walk_subquery, uchar *arg)
{
if (example && example->walk(processor, walk_subquery, arg))
return TRUE;
return (this->*processor)(arg);
}
};