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
765452db
Commit
765452db
authored
Nov 14, 2017
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-14388 Server crashes in handle_select / val_uint in ORACLE mode
parent
071aece9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
75 additions
and
0 deletions
+75
-0
mysql-test/suite/compat/oracle/r/sp-cursor-rowtype.result
mysql-test/suite/compat/oracle/r/sp-cursor-rowtype.result
+33
-0
mysql-test/suite/compat/oracle/t/sp-cursor-rowtype.test
mysql-test/suite/compat/oracle/t/sp-cursor-rowtype.test
+36
-0
sql/sp_rcontext.cc
sql/sp_rcontext.cc
+6
-0
No files found.
mysql-test/suite/compat/oracle/r/sp-cursor-rowtype.result
View file @
765452db
...
@@ -1359,3 +1359,36 @@ t2 CREATE TABLE "t2" (
...
@@ -1359,3 +1359,36 @@ t2 CREATE TABLE "t2" (
"b" varchar(3) DEFAULT NULL,
"b" varchar(3) DEFAULT NULL,
"c" time DEFAULT NULL
"c" time DEFAULT NULL
)
)
#
# MDEV-14388 Server crashes in handle_select / val_uint in ORACLE mode
#
CREATE TABLE t1 (id INT);
INSERT INTO t1 VALUES (0),(1),(2),(3);
CREATE FUNCTION f1() RETURN INT is
BEGIN
FOR v1 in (SELECT id FROM t1)
LOOP
NULL;
END LOOP;
RETURN 1;
END;
$$
SELECT f1();
f1()
1
DROP FUNCTION f1;
DROP TABLE t1;
CREATE TABLE t1 (id INT);
INSERT INTO t1 VALUES (1),(2),(3),(4);
CREATE FUNCTION f1() RETURN INT IS
CURSOR cur IS SELECT id FROM t1;
rec cur%ROWTYPE;
BEGIN
RETURN 1;
END;
$$
SELECT f1();
f1()
1
DROP FUNCTION f1;
DROP TABLE t1;
mysql-test/suite/compat/oracle/t/sp-cursor-rowtype.test
View file @
765452db
...
@@ -1444,3 +1444,39 @@ BEGIN
...
@@ -1444,3 +1444,39 @@ BEGIN
END
;
END
;
$$
$$
DELIMITER
;
$$
DELIMITER
;
$$
--
echo
#
--
echo
# MDEV-14388 Server crashes in handle_select / val_uint in ORACLE mode
--
echo
#
CREATE
TABLE
t1
(
id
INT
);
INSERT
INTO
t1
VALUES
(
0
),(
1
),(
2
),(
3
);
DELIMITER
$$
;
CREATE
FUNCTION
f1
()
RETURN
INT
is
BEGIN
FOR
v1
in
(
SELECT
id
FROM
t1
)
LOOP
NULL
;
END
LOOP
;
RETURN
1
;
END
;
$$
DELIMITER
;
$$
SELECT
f1
();
DROP
FUNCTION
f1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
id
INT
);
INSERT
INTO
t1
VALUES
(
1
),(
2
),(
3
),(
4
);
DELIMITER
$$
;
CREATE
FUNCTION
f1
()
RETURN
INT
IS
CURSOR
cur
IS
SELECT
id
FROM
t1
;
rec
cur
%
ROWTYPE
;
BEGIN
RETURN
1
;
END
;
$$
DELIMITER
;
$$
SELECT
f1
();
DROP
FUNCTION
f1
;
DROP
TABLE
t1
;
sql/sp_rcontext.cc
View file @
765452db
...
@@ -802,7 +802,13 @@ int sp_cursor::open_view_structure_only(THD *thd)
...
@@ -802,7 +802,13 @@ int sp_cursor::open_view_structure_only(THD *thd)
if
(
!
(
thd
->
lex
->
limit_rows_examined
=
new
(
thd
->
mem_root
)
Item_uint
(
thd
,
0
)))
if
(
!
(
thd
->
lex
->
limit_rows_examined
=
new
(
thd
->
mem_root
)
Item_uint
(
thd
,
0
)))
return
-
1
;
return
-
1
;
thd
->
no_errors
=
true
;
// Suppress ER_QUERY_EXCEEDED_ROWS_EXAMINED_LIMIT
thd
->
no_errors
=
true
;
// Suppress ER_QUERY_EXCEEDED_ROWS_EXAMINED_LIMIT
DBUG_ASSERT
(
!
thd
->
killed
);
res
=
open
(
thd
);
res
=
open
(
thd
);
/*
The query possibly exited on LIMIT ROWS EXAMINED and set thd->killed.
Reset it now.
*/
thd
->
reset_killed
();
thd
->
no_errors
=
thd_no_errors_save
;
thd
->
no_errors
=
thd_no_errors_save
;
thd
->
lex
->
limit_rows_examined
=
limit_rows_examined
;
thd
->
lex
->
limit_rows_examined
=
limit_rows_examined
;
return
res
;
return
res
;
...
...
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