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
b5c72a84
Commit
b5c72a84
authored
Mar 04, 2019
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-18358: Server crash when using SET STATEMENT max_statement_time
Do not init lex before choosing main select.
parent
1bcb66c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
4 deletions
+21
-4
mysql-test/main/set_statement.result
mysql-test/main/set_statement.result
+10
-0
mysql-test/main/set_statement.test
mysql-test/main/set_statement.test
+9
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-2
sql/sql_yacc_ora.yy
sql/sql_yacc_ora.yy
+1
-2
No files found.
mysql-test/main/set_statement.result
View file @
b5c72a84
...
...
@@ -1231,4 +1231,14 @@ SET STATEMENT myisam_sort_buffer_size=800000 FOR OPTIMIZE TABLE t;
Table Op Msg_type Msg_text
test.t optimize status Table is already up to date
SET sql_mode=default;
SET STATEMENT myisam_sort_buffer_size=800000 FOR OPTIMIZE TABLE t;
Table Op Msg_type Msg_text
test.t optimize status Table is already up to date
drop table t;
#
# MDEV-18358: Server crash when using SET STATEMENT max_statement_time
#
SET sql_mode=ORACLE;
SET STATEMENT max_statement_time=30 FOR DELETE FROM mysql.user where user = 'unknown';
SET sql_mode=default;
SET STATEMENT max_statement_time=30 FOR DELETE FROM mysql.user where user = 'unknown';
mysql-test/main/set_statement.test
View file @
b5c72a84
...
...
@@ -1135,5 +1135,14 @@ create table t (a int);
SET
sql_mode
=
ORACLE
;
SET
STATEMENT
myisam_sort_buffer_size
=
800000
FOR
OPTIMIZE
TABLE
t
;
SET
sql_mode
=
default
;
SET
STATEMENT
myisam_sort_buffer_size
=
800000
FOR
OPTIMIZE
TABLE
t
;
drop
table
t
;
--
echo
#
--
echo
# MDEV-18358: Server crash when using SET STATEMENT max_statement_time
--
echo
#
SET
sql_mode
=
ORACLE
;
SET
STATEMENT
max_statement_time
=
30
FOR
DELETE
FROM
mysql
.
user
where
user
=
'unknown'
;
SET
sql_mode
=
default
;
SET
STATEMENT
max_statement_time
=
30
FOR
DELETE
FROM
mysql
.
user
where
user
=
'unknown'
;
sql/sql_yacc.yy
View file @
b5c72a84
...
...
@@ -13679,12 +13679,11 @@ delete:
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DELETE;
mysql_init_select(lex);
YYPS->m_lock_type= TL_WRITE_DEFAULT;
YYPS->m_mdl_type= MDL_SHARED_WRITE;
if (Lex->main_select_push())
MYSQL_YYABORT;
mysql_init_select(lex);
lex->ignore= 0;
lex->first_select_lex()->order_list.empty();
}
...
...
sql/sql_yacc_ora.yy
View file @
b5c72a84
...
...
@@ -13792,12 +13792,11 @@ delete:
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DELETE;
mysql_init_select(lex);
YYPS->m_lock_type= TL_WRITE_DEFAULT;
YYPS->m_mdl_type= MDL_SHARED_WRITE;
if (Lex->main_select_push())
MYSQL_YYABORT;
mysql_init_select(lex);
lex->ignore= 0;
lex->first_select_lex()->order_list.empty();
}
...
...
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