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
b1647d17
Commit
b1647d17
authored
Oct 20, 2009
by
Kristofer Pettersson
Browse files
Options
Browse Files
Download
Plain Diff
automerge
parents
ce9f6dda
4d937b6a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
137 additions
and
15 deletions
+137
-15
mysql-test/r/sp.result
mysql-test/r/sp.result
+45
-0
mysql-test/t/sp.test
mysql-test/t/sp.test
+45
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+47
-14
No files found.
mysql-test/r/sp.result
View file @
b1647d17
...
@@ -6979,6 +6979,51 @@ CALL p1;
...
@@ -6979,6 +6979,51 @@ CALL p1;
ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY subquery'
ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY subquery'
DROP PROCEDURE p1;
DROP PROCEDURE p1;
DROP TABLE t1, t2;
DROP TABLE t1, t2;
#
# Bug47627 SET @@{global.session}.local_variable in stored routine causes crash
#
DROP PROCEDURE IF EXISTS p1;
DROP PROCEDURE IF EXISTS p2;
DROP PROCEDURE IF EXISTS p3;
CREATE PROCEDURE p1()
BEGIN
DECLARE v INT DEFAULT 0;
SET @@session.v= 10;
END//
ERROR HY000: Unknown system variable 'v'
CREATE PROCEDURE p2()
BEGIN
DECLARE v INT DEFAULT 0;
SET v= 10;
END//
call p2()//
CREATE PROCEDURE p3()
BEGIN
DECLARE v INT DEFAULT 0;
SELECT @@session.v;
END//
ERROR HY000: Unknown system variable 'v'
CREATE PROCEDURE p4()
BEGIN
DECLARE v INT DEFAULT 0;
SET @@global.v= 10;
END//
ERROR HY000: Unknown system variable 'v'
CREATE PROCEDURE p5()
BEGIN
DECLARE v INT DEFAULT 0;
SET @@global.query_cache_size= 0;
SET @@session.identity= 1;
SELECT @@session.identity;
SELECT @@global.query_cache_size;
END//
CALL p5();
@@session.identity
1
@@global.query_cache_size
0
DROP PROCEDURE p2;
DROP PROCEDURE p5;
# ------------------------------------------------------------------
# ------------------------------------------------------------------
# -- End of 5.1 tests
# -- End of 5.1 tests
# ------------------------------------------------------------------
# ------------------------------------------------------------------
mysql-test/t/sp.test
View file @
b1647d17
...
@@ -8263,7 +8263,51 @@ CALL p1;
...
@@ -8263,7 +8263,51 @@ CALL p1;
DROP
PROCEDURE
p1
;
DROP
PROCEDURE
p1
;
DROP
TABLE
t1
,
t2
;
DROP
TABLE
t1
,
t2
;
--
echo
#
--
echo
# Bug47627 SET @@{global.session}.local_variable in stored routine causes crash
--
echo
#
--
disable_warnings
DROP
PROCEDURE
IF
EXISTS
p1
;
DROP
PROCEDURE
IF
EXISTS
p2
;
DROP
PROCEDURE
IF
EXISTS
p3
;
--
enable_warnings
delimiter
//;
--
error
ER_UNKNOWN_SYSTEM_VARIABLE
CREATE
PROCEDURE
p1
()
BEGIN
DECLARE
v
INT
DEFAULT
0
;
SET
@@
session
.
v
=
10
;
END
//
CREATE
PROCEDURE
p2
()
BEGIN
DECLARE
v
INT
DEFAULT
0
;
SET
v
=
10
;
END
//
call
p2
()
//
--
error
ER_UNKNOWN_SYSTEM_VARIABLE
CREATE
PROCEDURE
p3
()
BEGIN
DECLARE
v
INT
DEFAULT
0
;
SELECT
@@
session
.
v
;
END
//
--
error
ER_UNKNOWN_SYSTEM_VARIABLE
CREATE
PROCEDURE
p4
()
BEGIN
DECLARE
v
INT
DEFAULT
0
;
SET
@@
global
.
v
=
10
;
END
//
CREATE
PROCEDURE
p5
()
BEGIN
DECLARE
v
INT
DEFAULT
0
;
SET
@@
global
.
query_cache_size
=
0
;
SET
@@
session
.
identity
=
1
;
SELECT
@@
session
.
identity
;
SELECT
@@
global
.
query_cache_size
;
END
//
delimiter
;
//
CALL
p5
();
DROP
PROCEDURE
p2
;
DROP
PROCEDURE
p5
;
--
echo
# ------------------------------------------------------------------
--
echo
# ------------------------------------------------------------------
--
echo
# -- End of 5.1 tests
--
echo
# -- End of 5.1 tests
--
echo
# ------------------------------------------------------------------
--
echo
# ------------------------------------------------------------------
sql/sql_yacc.yy
View file @
b1647d17
...
@@ -11783,8 +11783,17 @@ option_type:
...
@@ -11783,8 +11783,17 @@ option_type:
;
;
option_type2:
option_type2:
/* empty */ { $$= OPT_DEFAULT; }
/* empty */
| ONE_SHOT_SYM { Lex->one_shot_set= 1; $$= OPT_SESSION; }
{
$$= OPT_DEFAULT;
Lex->option_type= OPT_DEFAULT;
}
| ONE_SHOT_SYM
{
Lex->one_shot_set= 1;
$$= OPT_SESSION;
Lex->option_type= OPT_SESSION;
}
;
;
opt_var_type:
opt_var_type:
...
@@ -11795,10 +11804,26 @@ opt_var_type:
...
@@ -11795,10 +11804,26 @@ opt_var_type:
;
;
opt_var_ident_type:
opt_var_ident_type:
/* empty */ { $$=OPT_DEFAULT; }
/* empty */
| GLOBAL_SYM '.' { $$=OPT_GLOBAL; }
{
| LOCAL_SYM '.' { $$=OPT_SESSION; }
$$=OPT_DEFAULT;
| SESSION_SYM '.' { $$=OPT_SESSION; }
Lex->option_type= OPT_DEFAULT;
}
| GLOBAL_SYM '.'
{
$$=OPT_GLOBAL;
Lex->option_type= OPT_GLOBAL;
}
| LOCAL_SYM '.'
{
$$=OPT_SESSION;
Lex->option_type= OPT_SESSION;
}
| SESSION_SYM '.'
{
$$=OPT_SESSION;
Lex->option_type= OPT_SESSION;
}
;
;
ext_option_value:
ext_option_value:
...
@@ -12038,8 +12063,22 @@ internal_variable_name:
...
@@ -12038,8 +12063,22 @@ internal_variable_name:
sp_pcontext *spc= lex->spcont;
sp_pcontext *spc= lex->spcont;
sp_variable_t *spv;
sp_variable_t *spv;
/* We have to lookup here since local vars can shadow sysvars */
/*
if (!spc || !(spv = spc->find_variable(&$1)))
We have to lookup here since local vars can shadow sysvars.
We also have to inspect the option_type first since the variable
identifier might have been prefixed with @@session or @@global
prefixes. Without this check we would wrongly identify them
as SP local variables.
*/
if (lex->option_type == OPT_DEFAULT && spc &&
(spv= spc->find_variable(&$1)))
{
/* An SP local variable */
$$.var= NULL;
$$.base_name= $1;
}
else
{
{
/* Not an SP local variable */
/* Not an SP local variable */
sys_var *tmp=find_sys_var(thd, $1.str, $1.length);
sys_var *tmp=find_sys_var(thd, $1.str, $1.length);
...
@@ -12056,12 +12095,6 @@ internal_variable_name:
...
@@ -12056,12 +12095,6 @@ internal_variable_name:
lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;
lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;
}
}
}
}
else
{
/* An SP local variable */
$$.var= NULL;
$$.base_name= $1;
}
}
}
| ident '.' ident
| ident '.' ident
{
{
...
...
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