Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
609befda
Commit
609befda
authored
18 years ago
by
gkodinov/kgeorge@macbook.gmz
Browse files
Options
Browse Files
Download
Plain Diff
Merge macbook.gmz:/Users/kgeorge/mysql/work/B20792-4.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B20792-5.0-opt
parents
67dd8dce
565d4959
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
2 deletions
+38
-2
mysql-test/r/subselect2.result
mysql-test/r/subselect2.result
+12
-0
mysql-test/t/subselect2.test
mysql-test/t/subselect2.test
+18
-0
sql/sql_select.cc
sql/sql_select.cc
+8
-2
No files found.
mysql-test/r/subselect2.result
View file @
609befda
...
@@ -132,3 +132,15 @@ id select_type table type possible_keys key key_len ref rows Extra
...
@@ -132,3 +132,15 @@ id select_type table type possible_keys key key_len ref rows Extra
5 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY,FFOLDERID_IDX PRIMARY 34 func 1 Using index; Using where
5 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY,FFOLDERID_IDX PRIMARY 34 func 1 Using index; Using where
6 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY,FFOLDERID_IDX,CMFLDRPARNT_IDX PRIMARY 34 func 1 Using index; Using where
6 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY,FFOLDERID_IDX,CMFLDRPARNT_IDX PRIMARY 34 func 1 Using index; Using where
drop table t1, t2, t3, t4;
drop table t1, t2, t3, t4;
CREATE TABLE t1 (a int(10) , PRIMARY KEY (a)) Engine=InnoDB;
INSERT INTO t1 VALUES (1),(2);
CREATE TABLE t2 (a int(10), PRIMARY KEY (a)) Engine=InnoDB;
INSERT INTO t2 VALUES (1);
CREATE TABLE t3 (a int(10), b int(10), c int(10),
PRIMARY KEY (a)) Engine=InnoDB;
INSERT INTO t3 VALUES (1,2,1);
SELECT t1.* FROM t1 WHERE (SELECT COUNT(*) FROM t3,t2 WHERE t3.c=t2.a
and t2.a='1' AND t1.a=t3.b) > 0;
a
2
DROP TABLE t1,t2,t3;
This diff is collapsed.
Click to expand it.
mysql-test/t/subselect2.test
View file @
609befda
...
@@ -150,3 +150,21 @@ EXPLAIN SELECT t2.*, t4.DOCTYPENAME, t1.CONTENTSIZE,t1.MIMETYPE FROM t2 INNER JO
...
@@ -150,3 +150,21 @@ EXPLAIN SELECT t2.*, t4.DOCTYPENAME, t1.CONTENTSIZE,t1.MIMETYPE FROM t2 INNER JO
drop
table
t1
,
t2
,
t3
,
t4
;
drop
table
t1
,
t2
,
t3
,
t4
;
# End of 4.1 tests
# End of 4.1 tests
#
# Bug #20792: Incorrect results from aggregate subquery
#
CREATE
TABLE
t1
(
a
int
(
10
)
,
PRIMARY
KEY
(
a
))
Engine
=
InnoDB
;
INSERT
INTO
t1
VALUES
(
1
),(
2
);
CREATE
TABLE
t2
(
a
int
(
10
),
PRIMARY
KEY
(
a
))
Engine
=
InnoDB
;
INSERT
INTO
t2
VALUES
(
1
);
CREATE
TABLE
t3
(
a
int
(
10
),
b
int
(
10
),
c
int
(
10
),
PRIMARY
KEY
(
a
))
Engine
=
InnoDB
;
INSERT
INTO
t3
VALUES
(
1
,
2
,
1
);
SELECT
t1
.*
FROM
t1
WHERE
(
SELECT
COUNT
(
*
)
FROM
t3
,
t2
WHERE
t3
.
c
=
t2
.
a
and
t2
.
a
=
'1'
AND
t1
.
a
=
t3
.
b
)
>
0
;
DROP
TABLE
t1
,
t2
,
t3
;
This diff is collapsed.
Click to expand it.
sql/sql_select.cc
View file @
609befda
...
@@ -6194,10 +6194,16 @@ return_zero_rows(JOIN *join, select_result *result,TABLE_LIST *tables,
...
@@ -6194,10 +6194,16 @@ return_zero_rows(JOIN *join, select_result *result,TABLE_LIST *tables,
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
/*
used only in JOIN::clear
*/
static
void
clear_tables
(
JOIN
*
join
)
static
void
clear_tables
(
JOIN
*
join
)
{
{
for
(
uint
i
=
0
;
i
<
join
->
tables
;
i
++
)
/*
must clear only the non-const tables, as const tables
are not re-calculated.
*/
for
(
uint
i
=
join
->
const_tables
;
i
<
join
->
tables
;
i
++
)
mark_as_null_row
(
join
->
table
[
i
]);
// All fields are NULL
mark_as_null_row
(
join
->
table
[
i
]);
// All fields are NULL
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment