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
2d4639c4
Commit
2d4639c4
authored
Oct 23, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
parents
084753af
bbce18c3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
1 deletion
+27
-1
mysql-test/r/delete.result
mysql-test/r/delete.result
+8
-0
mysql-test/t/delete.test
mysql-test/t/delete.test
+15
-0
sql/filesort.cc
sql/filesort.cc
+4
-1
No files found.
mysql-test/r/delete.result
View file @
2d4639c4
...
@@ -271,3 +271,11 @@ a
...
@@ -271,3 +271,11 @@ a
DROP TABLE t1, t2;
DROP TABLE t1, t2;
DROP DATABASE db1;
DROP DATABASE db1;
DROP DATABASE db2;
DROP DATABASE db2;
CREATE FUNCTION f1() RETURNS INT RETURN 1;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (0);
DELETE FROM t1 ORDER BY (f1(10)) LIMIT 1;
ERROR 42000: Incorrect number of arguments for FUNCTION test.f1; expected 0, got 1
DROP TABLE t1;
DROP FUNCTION f1;
End of 5.0 tests
mysql-test/t/delete.test
View file @
2d4639c4
...
@@ -277,3 +277,18 @@ SELECT * FROM t1;
...
@@ -277,3 +277,18 @@ SELECT * FROM t1;
DROP
TABLE
t1
,
t2
;
DROP
TABLE
t1
,
t2
;
DROP
DATABASE
db1
;
DROP
DATABASE
db1
;
DROP
DATABASE
db2
;
DROP
DATABASE
db2
;
#
# Bug 31742: delete from ... order by function call that causes an error,
# asserts server
#
CREATE
FUNCTION
f1
()
RETURNS
INT
RETURN
1
;
CREATE
TABLE
t1
(
a
INT
);
INSERT
INTO
t1
VALUES
(
0
);
--
error
1318
DELETE
FROM
t1
ORDER
BY
(
f1
(
10
))
LIMIT
1
;
DROP
TABLE
t1
;
DROP
FUNCTION
f1
;
--
echo
End
of
5.0
tests
sql/filesort.cc
View file @
2d4639c4
...
@@ -534,7 +534,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
...
@@ -534,7 +534,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
file
->
unlock_row
();
file
->
unlock_row
();
/* It does not make sense to read more keys in case of a fatal error */
/* It does not make sense to read more keys in case of a fatal error */
if
(
thd
->
net
.
report_error
)
if
(
thd
->
net
.
report_error
)
DBUG_RETURN
(
HA_POS_ERROR
)
;
break
;
}
}
if
(
quick_select
)
if
(
quick_select
)
{
{
...
@@ -551,6 +551,9 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
...
@@ -551,6 +551,9 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
file
->
ha_rnd_end
();
file
->
ha_rnd_end
();
}
}
if
(
thd
->
net
.
report_error
)
DBUG_RETURN
(
HA_POS_ERROR
);
DBUG_PRINT
(
"test"
,(
"error: %d indexpos: %d"
,
error
,
indexpos
));
DBUG_PRINT
(
"test"
,(
"error: %d indexpos: %d"
,
error
,
indexpos
));
if
(
error
!=
HA_ERR_END_OF_FILE
)
if
(
error
!=
HA_ERR_END_OF_FILE
)
{
{
...
...
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