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
22c9663d
Commit
22c9663d
authored
Aug 15, 2017
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
parent
6179a8ef
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
49 additions
and
2 deletions
+49
-2
mysql-test/r/sp-row.result
mysql-test/r/sp-row.result
+10
-0
mysql-test/suite/compat/oracle/r/sp-row.result
mysql-test/suite/compat/oracle/r/sp-row.result
+11
-0
mysql-test/suite/compat/oracle/t/sp-row.test
mysql-test/suite/compat/oracle/t/sp-row.test
+13
-0
mysql-test/t/sp-row.test
mysql-test/t/sp-row.test
+13
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-1
sql/sql_yacc_ora.yy
sql/sql_yacc_ora.yy
+1
-1
No files found.
mysql-test/r/sp-row.result
View file @
22c9663d
...
@@ -2246,3 +2246,13 @@ b
...
@@ -2246,3 +2246,13 @@ b
10
10
DROP PROCEDURE p1;
DROP PROCEDURE p1;
DROP TABLE t1;
DROP TABLE t1;
#
# MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
#
BEGIN NOT ATOMIC
DECLARE a ROW(a INT);
EXPLAIN SELECT 1 INTO a.a;
END;
$$
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
mysql-test/suite/compat/oracle/r/sp-row.result
View file @
22c9663d
...
@@ -3070,3 +3070,14 @@ b
...
@@ -3070,3 +3070,14 @@ b
10
10
DROP PROCEDURE p1;
DROP PROCEDURE p1;
DROP TABLE t1;
DROP TABLE t1;
#
# MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
#
DECLARE
a ROW(a INT);
BEGIN
EXPLAIN SELECT 1 INTO a.a;
END;
$$
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
mysql-test/suite/compat/oracle/t/sp-row.test
View file @
22c9663d
...
@@ -2375,3 +2375,16 @@ DELIMITER ;$$
...
@@ -2375,3 +2375,16 @@ DELIMITER ;$$
CALL
p1
;
CALL
p1
;
DROP
PROCEDURE
p1
;
DROP
PROCEDURE
p1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
--
echo
#
DELIMITER
$$
;
DECLARE
a
ROW
(
a
INT
);
BEGIN
EXPLAIN
SELECT
1
INTO
a
.
a
;
END
;
$$
DELIMITER
;
$$
mysql-test/t/sp-row.test
View file @
22c9663d
...
@@ -1471,3 +1471,16 @@ DELIMITER ;$$
...
@@ -1471,3 +1471,16 @@ DELIMITER ;$$
CALL
p1
;
CALL
p1
;
DROP
PROCEDURE
p1
;
DROP
PROCEDURE
p1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
--
echo
#
DELIMITER
$$
;
BEGIN
NOT
ATOMIC
DECLARE
a
ROW
(
a
INT
);
EXPLAIN
SELECT
1
INTO
a
.
a
;
END
;
$$
DELIMITER
;
$$
sql/sql_yacc.yy
View file @
22c9663d
...
@@ -12155,7 +12155,7 @@ select_outvar:
...
@@ -12155,7 +12155,7 @@ select_outvar:
}
}
| ident '.' ident
| ident '.' ident
{
{
if (!($$= Lex->create_outvar(thd, &$1, &$3)))
if (!($$= Lex->create_outvar(thd, &$1, &$3))
&& Lex->result
)
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
;
;
...
...
sql/sql_yacc_ora.yy
View file @
22c9663d
...
@@ -12218,7 +12218,7 @@ select_outvar:
...
@@ -12218,7 +12218,7 @@ select_outvar:
}
}
| ident '.' ident
| ident '.' ident
{
{
if (!($$= Lex->create_outvar(thd, &$1, &$3)))
if (!($$= Lex->create_outvar(thd, &$1, &$3))
&& Lex->result
)
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
;
;
...
...
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