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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d75d6da8
Commit
d75d6da8
authored
Jul 04, 2003
by
monty@narttu.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
parents
a3fe7c09
38a2ed6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
mysql-test/r/merge.result
mysql-test/r/merge.result
+2
-0
sql/ha_myisammrg.h
sql/ha_myisammrg.h
+2
-1
sql/sql_select.cc
sql/sql_select.cc
+2
-0
No files found.
mysql-test/r/merge.result
View file @
d75d6da8
...
@@ -607,4 +607,6 @@ x y
...
@@ -607,4 +607,6 @@ x y
1 3
1 3
select * from t3 where x = 1 and y < 5 order by y desc;
select * from t3 where x = 1 and y < 5 order by y desc;
x y
x y
1 3
1 2
drop table t1,t2,t3;
drop table t1,t2,t3;
sql/ha_myisammrg.h
View file @
d75d6da8
...
@@ -40,7 +40,8 @@ class ha_myisammrg: public handler
...
@@ -40,7 +40,8 @@ class ha_myisammrg: public handler
}
}
ulong
index_flags
(
uint
inx
)
const
ulong
index_flags
(
uint
inx
)
const
{
{
ulong
flags
=
(
HA_READ_NEXT
|
HA_READ_PREV
|
HA_READ_ORDER
);
ulong
flags
=
(
HA_READ_NEXT
|
HA_READ_PREV
|
HA_READ_ORDER
|
HA_NOT_READ_PREFIX_LAST
);
// This - last - flag is ONLY for 4.0 !!!
return
(
flags
|
((
table
->
key_info
[
inx
].
algorithm
==
HA_KEY_ALG_FULLTEXT
)
?
return
(
flags
|
((
table
->
key_info
[
inx
].
algorithm
==
HA_KEY_ALG_FULLTEXT
)
?
0
:
HA_KEY_READ_ONLY
));
0
:
HA_KEY_READ_ONLY
));
}
}
...
...
sql/sql_select.cc
View file @
d75d6da8
...
@@ -5843,6 +5843,8 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
...
@@ -5843,6 +5843,8 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
*/
*/
if
(
!
select
->
quick
->
reverse_sorted
())
if
(
!
select
->
quick
->
reverse_sorted
())
{
{
if
(
table
->
file
->
index_flags
(
ref_key
)
&
HA_NOT_READ_PREFIX_LAST
)
DBUG_RETURN
(
0
);
// Use filesort
// ORDER BY range_key DESC
// ORDER BY range_key DESC
QUICK_SELECT_DESC
*
tmp
=
new
QUICK_SELECT_DESC
(
select
->
quick
,
QUICK_SELECT_DESC
*
tmp
=
new
QUICK_SELECT_DESC
(
select
->
quick
,
used_key_parts
);
used_key_parts
);
...
...
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