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
594f4c35
Commit
594f4c35
authored
Nov 28, 2003
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
3f6ef8d1
3b49d34f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
mysql-test/r/order_by.result
mysql-test/r/order_by.result
+4
-0
mysql-test/t/order_by.test
mysql-test/t/order_by.test
+8
-0
sql/sql_base.cc
sql/sql_base.cc
+1
-1
No files found.
mysql-test/r/order_by.result
View file @
594f4c35
...
@@ -580,3 +580,7 @@ FieldKey LongVal StringVal
...
@@ -580,3 +580,7 @@ FieldKey LongVal StringVal
3 2 1
3 2 1
3 3 3
3 3 3
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (a INT, b INT);
SET @id=0;
UPDATE t1 SET a=0 ORDER BY (a=@id), b;
DROP TABLE t1;
mysql-test/t/order_by.test
View file @
594f4c35
...
@@ -365,3 +365,11 @@ SELECT * FROM t1 WHERE FieldKey > '2' ORDER BY LongVal;
...
@@ -365,3 +365,11 @@ SELECT * FROM t1 WHERE FieldKey > '2' ORDER BY LongVal;
EXPLAIN
SELECT
*
FROM
t1
WHERE
FieldKey
>
'2'
ORDER
BY
FieldKey
,
LongVal
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
FieldKey
>
'2'
ORDER
BY
FieldKey
,
LongVal
;
SELECT
*
FROM
t1
WHERE
FieldKey
>
'2'
ORDER
BY
FieldKey
,
LongVal
;
SELECT
*
FROM
t1
WHERE
FieldKey
>
'2'
ORDER
BY
FieldKey
,
LongVal
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# Bug #1945 - Crashing bug with bad User Variables in UPDATE ... ORDER BY ...
#
CREATE
TABLE
t1
(
a
INT
,
b
INT
);
SET
@
id
=
0
;
UPDATE
t1
SET
a
=
0
ORDER
BY
(
a
=@
id
),
b
;
DROP
TABLE
t1
;
sql/sql_base.cc
View file @
594f4c35
...
@@ -1932,7 +1932,7 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter,
...
@@ -1932,7 +1932,7 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter,
}
}
}
}
else
if
(
!
table_name
&&
(
item
->
eq
(
find
,
0
)
||
else
if
(
!
table_name
&&
(
item
->
eq
(
find
,
0
)
||
find
->
name
&&
find
->
name
&&
item
->
name
&&
!
my_strcasecmp
(
system_charset_info
,
!
my_strcasecmp
(
system_charset_info
,
item
->
name
,
find
->
name
)))
item
->
name
,
find
->
name
)))
{
{
...
...
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