summaryrefslogtreecommitdiff
path: root/mysql-test/r/subselect_innodb.result
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-12-10 22:46:14 +0200
committerunknown <bell@sanja.is.com.ua>2003-12-10 22:46:14 +0200
commitfc75518a78af9dfb68baac2cbf279983fe54b492 (patch)
treeae06b7876934d32768f586a08de67e43088d1fad /mysql-test/r/subselect_innodb.result
parente0daf11201dd6e81af73c1c74270039e73845a24 (diff)
downloadmariadb-git-fc75518a78af9dfb68baac2cbf279983fe54b492.tar.gz
fixed unlocking tables during subquery execution (BUG#2048)
mysql-test/r/subselect_innodb.result: bug 2048 test mysql-test/t/subselect_innodb.test: bug 2048 test sql/item_subselect.cc: do not unlock tables for subqueries sql/sql_derived.cc: derived table tables can be unlocked sql/sql_lex.h: new interface to pass additional options sql/sql_union.cc: new interface to pass additional options do not unlock tables for UNION
Diffstat (limited to 'mysql-test/r/subselect_innodb.result')
-rw-r--r--mysql-test/r/subselect_innodb.result20
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/subselect_innodb.result b/mysql-test/r/subselect_innodb.result
index 2f5b92fd05d..83ff5209e58 100644
--- a/mysql-test/r/subselect_innodb.result
+++ b/mysql-test/r/subselect_innodb.result
@@ -63,3 +63,23 @@ processor_id (SELECT y.yod_id FROM t1 p2, t2 y WHERE p2.processor_id = p1.proces
2 1
3 1
drop table t1,t2,t3;
+CREATE TABLE t1 (
+id int(11) NOT NULL default '0',
+b int(11) default NULL,
+c char(3) default NULL,
+PRIMARY KEY (id),
+KEY t2i1 (b)
+) TYPE=innodb DEFAULT CHARSET=latin1;
+INSERT INTO t1 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL');
+CREATE TABLE t2 (
+id int(11) NOT NULL default '0',
+b int(11) default NULL,
+c char(3) default NULL,
+PRIMARY KEY (id),
+KEY t2i (b)
+) TYPE=innodb DEFAULT CHARSET=latin1;
+INSERT INTO t2 VALUES (0,0,'GPL'),(1,0,'GPL'),(2,1,'GPL'),(3,2,'GPL');
+select (select max(id) from t2 where b=1 group by b) as x,b from t1 where b=1;
+x b
+2 1
+drop table t1,t2;