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
12b65b31
Commit
12b65b31
authored
Jun 07, 2004
by
pem@mysql.comhem.se
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes.
parent
3dcd7e53
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
mysql-test/r/index_merge.result
mysql-test/r/index_merge.result
+1
-0
sql/opt_range.cc
sql/opt_range.cc
+3
-2
sql/sql_select.cc
sql/sql_select.cc
+1
-0
No files found.
mysql-test/r/index_merge.result
View file @
12b65b31
...
...
@@ -280,6 +280,7 @@ union select * from t1 where key1<4 or key3=5;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 index_merge i1,i2 i1,i2 4,4 NULL 2 Using where
2 UNION t1 index_merge i1,i3 i1,i3 4,4 NULL 5 Using where
NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL
explain select * from (select * from t1 where key1 = 3 or key2 =3) as Z where key8 >5;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY <derived2> system NULL NULL NULL NULL 1
...
...
sql/opt_range.cc
View file @
12b65b31
...
...
@@ -646,6 +646,7 @@ QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr,
{
index
=
key_nr
;
head
=
table
;
key_part_info
=
head
->
key_info
[
index
].
key_part
;
my_init_dynamic_array
(
&
ranges
,
sizeof
(
QUICK_RANGE
*
),
16
,
16
);
if
(
!
no_alloc
&&
!
parent_alloc
)
...
...
@@ -662,8 +663,8 @@ QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr,
int
QUICK_RANGE_SELECT
::
init
()
{
key_part_info
=
head
->
key_info
[
index
].
key_part
;
return
(
error
=
file
->
index_init
(
index
));
DBUG_ENTER
(
"QUICK_RANGE_SELECT::init"
)
;
DBUG_RETURN
(
error
=
file
->
index_init
(
index
));
}
QUICK_RANGE_SELECT
::~
QUICK_RANGE_SELECT
()
...
...
sql/sql_select.cc
View file @
12b65b31
...
...
@@ -10450,6 +10450,7 @@ int mysql_explain_union(THD *thd, SELECT_LEX_UNIT *unit, select_result *result)
else
{
thd
->
lex
->
current_select
=
first
;
unit
->
set_limit
(
unit
->
global_parameters
,
first
);
res
=
mysql_select
(
thd
,
&
first
->
ref_pointer_array
,
(
TABLE_LIST
*
)
first
->
table_list
.
first
,
first
->
with_wild
,
first
->
item_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