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
8766627d
Commit
8766627d
authored
Mar 22, 2002
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for offset bug in UNION's and making UNION's obey
SELECT_DEFAULT_LIMIT
parent
a36bb38b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
1 deletion
+28
-1
Docs/manual.texi
Docs/manual.texi
+10
-0
mysql-test/r/union.result
mysql-test/r/union.result
+10
-0
mysql-test/t/union.test
mysql-test/t/union.test
+4
-0
sql/sql_union.cc
sql/sql_union.cc
+4
-1
No files found.
Docs/manual.texi
View file @
8766627d
...
@@ -48762,6 +48762,16 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
...
@@ -48762,6 +48762,16 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet
@itemize @bullet
@item
@item
Fixed bug in UNION's with last offset being transposed to total result set
@item
Fixed that DEFAULT_SELECT_LIMIT is always imposed on UNION's result set
@item
Fixed that some SELECT options can appear only in the first SELECT
@item
Fixed bug with LIMIT with UNION, where last select is in the braces
@item
Fixed that fulltext works fine with UNION's
@item
Fixed bug with indexless boolean full-text search.
Fixed bug with indexless boolean full-text search.
@item
@item
Fixed bug that sometimes appeared when full-text search was used
Fixed bug that sometimes appeared when full-text search was used
mysql-test/r/union.result
View file @
8766627d
...
@@ -177,4 +177,14 @@ a
...
@@ -177,4 +177,14 @@ a
11
11
12
12
13
13
(select * from t1 limit 2) union (select * from t2 limit 20,3);
a
1
2
set SQL_SELECT_LIMIT=2;
(select * from t1 limit 2) union (select * from t2 limit 3);
a
1
2
set SQL_SELECT_LIMIT=DEFAULT;
drop table t1,t2;
drop table t1,t2;
mysql-test/t/union.test
View file @
8766627d
...
@@ -84,4 +84,8 @@ insert into t1 values (1),(2),(3),(4),(5);
...
@@ -84,4 +84,8 @@ insert into t1 values (1),(2),(3),(4),(5);
insert
into
t2
values
(
11
),(
12
),(
13
),(
14
),(
15
);
insert
into
t2
values
(
11
),(
12
),(
13
),(
14
),(
15
);
(
select
*
from
t1
limit
2
)
union
(
select
*
from
t2
limit
3
)
limit
4
;
(
select
*
from
t1
limit
2
)
union
(
select
*
from
t2
limit
3
)
limit
4
;
(
select
*
from
t1
limit
2
)
union
(
select
*
from
t2
limit
3
);
(
select
*
from
t1
limit
2
)
union
(
select
*
from
t2
limit
3
);
(
select
*
from
t1
limit
2
)
union
(
select
*
from
t2
limit
20
,
3
);
set
SQL_SELECT_LIMIT
=
2
;
(
select
*
from
t1
limit
2
)
union
(
select
*
from
t2
limit
3
);
set
SQL_SELECT_LIMIT
=
DEFAULT
;
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
sql/sql_union.cc
View file @
8766627d
...
@@ -186,7 +186,10 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
...
@@ -186,7 +186,10 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
thd
->
options
&=
~
OPTION_FOUND_ROWS
;
thd
->
options
&=
~
OPTION_FOUND_ROWS
;
}
}
else
else
thd
->
select_limit
=
HA_POS_ERROR
;
// no limit
{
thd
->
offset_limit
=
0
;
thd
->
select_limit
=
thd
->
default_select_limit
;
}
if
(
describe
)
if
(
describe
)
thd
->
select_limit
=
HA_POS_ERROR
;
// no limit
thd
->
select_limit
=
HA_POS_ERROR
;
// no limit
res
=
mysql_select
(
thd
,
&
result_table_list
,
res
=
mysql_select
(
thd
,
&
result_table_list
,
...
...
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