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
6927e67d
Commit
6927e67d
authored
Sep 14, 2007
by
gkodinov/kgeorge@magare.gmz
Browse files
Options
Browse Files
Download
Plain Diff
Merge magare.gmz:/home/kgeorge/mysql/work/B31001-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B31001-5.1-opt
parents
c54ce038
a2afc56f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
127 additions
and
1 deletion
+127
-1
mysql-test/include/mix1.inc
mysql-test/include/mix1.inc
+23
-0
mysql-test/r/innodb_mysql.result
mysql-test/r/innodb_mysql.result
+97
-0
sql/sql_select.cc
sql/sql_select.cc
+7
-1
No files found.
mysql-test/include/mix1.inc
View file @
6927e67d
...
@@ -996,6 +996,29 @@ SELECT c,b FROM t1 GROUP BY c,b;
...
@@ -996,6 +996,29 @@ SELECT c,b FROM t1 GROUP BY c,b;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# Bug #31001: ORDER BY DESC in InnoDB not working
#
CREATE
TABLE
t1
(
a
INT
,
b
INT
,
PRIMARY
KEY
(
a
),
INDEX
b
(
b
))
ENGINE
=
InnoDB
;
INSERT
INTO
t1
(
a
,
b
)
VALUES
(
1
,
1
),
(
2
,
2
),
(
3
,
2
);
#The two queries below should produce different results, but they don't.
query_vertical
EXPLAIN
SELECT
*
FROM
t1
WHERE
b
=
2
ORDER
BY
a
ASC
;
SELECT
*
FROM
t1
WHERE
b
=
2
ORDER
BY
a
ASC
;
query_vertical
EXPLAIN
SELECT
*
FROM
t1
WHERE
b
=
2
ORDER
BY
a
DESC
;
SELECT
*
FROM
t1
WHERE
b
=
2
ORDER
BY
a
DESC
;
query_vertical
EXPLAIN
SELECT
*
FROM
t1
ORDER
BY
b
ASC
,
a
ASC
;
SELECT
*
FROM
t1
ORDER
BY
b
ASC
,
a
ASC
;
query_vertical
EXPLAIN
SELECT
*
FROM
t1
ORDER
BY
b
DESC
,
a
DESC
;
SELECT
*
FROM
t1
ORDER
BY
b
DESC
,
a
DESC
;
query_vertical
EXPLAIN
SELECT
*
FROM
t1
ORDER
BY
b
ASC
,
a
DESC
;
SELECT
*
FROM
t1
ORDER
BY
b
ASC
,
a
DESC
;
query_vertical
EXPLAIN
SELECT
*
FROM
t1
ORDER
BY
b
DESC
,
a
ASC
;
SELECT
*
FROM
t1
ORDER
BY
b
DESC
,
a
ASC
;
DROP
TABLE
t1
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
# Fix for BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY
# Fix for BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY
...
...
mysql-test/r/innodb_mysql.result
View file @
6927e67d
...
@@ -1190,6 +1190,103 @@ c b
...
@@ -1190,6 +1190,103 @@ c b
3 1
3 1
3 2
3 2
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a), INDEX b (b)) ENGINE=InnoDB;
INSERT INTO t1(a,b) VALUES (1,1), (2,2), (3,2);
EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a ASC;
id 1
select_type SIMPLE
table t1
type ref
possible_keys b
key b
key_len 5
ref const
rows 1
Extra Using where; Using index
SELECT * FROM t1 WHERE b=2 ORDER BY a ASC;
a b
2 2
3 2
EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a DESC;
id 1
select_type SIMPLE
table t1
type ref
possible_keys b
key b
key_len 5
ref const
rows 1
Extra Using where; Using index
SELECT * FROM t1 WHERE b=2 ORDER BY a DESC;
a b
3 2
2 2
EXPLAIN SELECT * FROM t1 ORDER BY b ASC, a ASC;
id 1
select_type SIMPLE
table t1
type index
possible_keys NULL
key b
key_len 5
ref NULL
rows 3
Extra Using index
SELECT * FROM t1 ORDER BY b ASC, a ASC;
a b
1 1
2 2
3 2
EXPLAIN SELECT * FROM t1 ORDER BY b DESC, a DESC;
id 1
select_type SIMPLE
table t1
type index
possible_keys NULL
key b
key_len 5
ref NULL
rows 3
Extra Using index
SELECT * FROM t1 ORDER BY b DESC, a DESC;
a b
3 2
2 2
1 1
EXPLAIN SELECT * FROM t1 ORDER BY b ASC, a DESC;
id 1
select_type SIMPLE
table t1
type index
possible_keys NULL
key b
key_len 5
ref NULL
rows 3
Extra Using index; Using filesort
SELECT * FROM t1 ORDER BY b ASC, a DESC;
a b
1 1
3 2
2 2
EXPLAIN SELECT * FROM t1 ORDER BY b DESC, a ASC;
id 1
select_type SIMPLE
table t1
type index
possible_keys NULL
key b
key_len 5
ref NULL
rows 3
Extra Using index; Using filesort
SELECT * FROM t1 ORDER BY b DESC, a ASC;
a b
2 2
3 2
1 1
DROP TABLE t1;
End of 5.0 tests
End of 5.0 tests
CREATE TABLE `t2` (
CREATE TABLE `t2` (
`k` int(11) NOT NULL auto_increment,
`k` int(11) NOT NULL auto_increment,
...
...
sql/sql_select.cc
View file @
6927e67d
...
@@ -12353,6 +12353,12 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
...
@@ -12353,6 +12353,12 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
for
(;
const_key_parts
&
1
;
const_key_parts
>>=
1
)
for
(;
const_key_parts
&
1
;
const_key_parts
>>=
1
)
key_part
++
;
key_part
++
;
/*
The primary and secondary key parts were all const (i.e. there's
one row). The sorting doesn't matter.
*/
if
(
key_part
==
key_part_end
&&
reverse
==
0
)
DBUG_RETURN
(
1
);
}
}
else
else
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
@@ -12995,7 +13001,7 @@ check_reverse_order:
...
@@ -12995,7 +13001,7 @@ check_reverse_order:
select
->
quick
=
tmp
;
select
->
quick
=
tmp
;
}
}
}
}
else
if
(
tab
->
ref
.
key
>=
0
&&
tab
->
ref
.
key_parts
<
used_key_parts
)
else
if
(
tab
->
ref
.
key
>=
0
&&
tab
->
ref
.
key_parts
<
=
used_key_parts
)
{
{
/*
/*
SELECT * FROM t1 WHERE a=1 ORDER BY a DESC,b DESC
SELECT * FROM t1 WHERE a=1 ORDER BY a DESC,b DESC
...
...
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