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
e2329215
Commit
e2329215
authored
15 years ago
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
merged additional fix for bug 33813 to 5.1-bugteam
parents
4c6692b7
ecae2a57
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
3 deletions
+35
-3
sql/sql_yacc.yy
sql/sql_yacc.yy
+35
-3
No files found.
sql/sql_yacc.yy
View file @
e2329215
...
@@ -9256,9 +9256,16 @@ drop:
...
@@ -9256,9 +9256,16 @@ drop:
lex->drop_if_exists=$3;
lex->drop_if_exists=$3;
lex->name= $4;
lex->name= $4;
}
}
| DROP FUNCTION_SYM if_exists
sp_name
| DROP FUNCTION_SYM if_exists
ident '.' ident
{
{
LEX *lex=Lex;
THD *thd= YYTHD;
LEX *lex= thd->lex;
sp_name *spname;
if ($4.str && check_db_name(&$4))
{
my_error(ER_WRONG_DB_NAME, MYF(0), $4.str);
MYSQL_YYABORT;
}
if (lex->sphead)
if (lex->sphead)
{
{
my_error(ER_SP_NO_DROP_SP, MYF(0), "FUNCTION");
my_error(ER_SP_NO_DROP_SP, MYF(0), "FUNCTION");
...
@@ -9266,7 +9273,32 @@ drop:
...
@@ -9266,7 +9273,32 @@ drop:
}
}
lex->sql_command = SQLCOM_DROP_FUNCTION;
lex->sql_command = SQLCOM_DROP_FUNCTION;
lex->drop_if_exists= $3;
lex->drop_if_exists= $3;
lex->spname= $4;
spname= new sp_name($4, $6, true);
if (spname == NULL)
MYSQL_YYABORT;
spname->init_qname(thd);
lex->spname= spname;
}
| DROP FUNCTION_SYM if_exists ident
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
LEX_STRING db= {0, 0};
sp_name *spname;
if (lex->sphead)
{
my_error(ER_SP_NO_DROP_SP, MYF(0), "FUNCTION");
MYSQL_YYABORT;
}
if (thd->db && lex->copy_db_to(&db.str, &db.length))
MYSQL_YYABORT;
lex->sql_command = SQLCOM_DROP_FUNCTION;
lex->drop_if_exists= $3;
spname= new sp_name(db, $4, false);
if (spname == NULL)
MYSQL_YYABORT;
spname->init_qname(thd);
lex->spname= spname;
}
}
| DROP PROCEDURE if_exists sp_name
| DROP PROCEDURE if_exists sp_name
{
{
...
...
This diff is collapsed.
Click to expand it.
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