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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
0f9e2c36
Commit
0f9e2c36
authored
Jan 15, 2003
by
pem@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some error handling in the SP parts of the parser.
parent
b863798a
Changes
25
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
153 additions
and
14 deletions
+153
-14
include/mysqld_error.h
include/mysqld_error.h
+8
-1
sql/share/czech/errmsg.txt
sql/share/czech/errmsg.txt
+6
-0
sql/share/danish/errmsg.txt
sql/share/danish/errmsg.txt
+6
-0
sql/share/dutch/errmsg.txt
sql/share/dutch/errmsg.txt
+6
-0
sql/share/english/errmsg.txt
sql/share/english/errmsg.txt
+6
-1
sql/share/estonian/errmsg.txt
sql/share/estonian/errmsg.txt
+6
-0
sql/share/french/errmsg.txt
sql/share/french/errmsg.txt
+6
-0
sql/share/german/errmsg.txt
sql/share/german/errmsg.txt
+6
-0
sql/share/greek/errmsg.txt
sql/share/greek/errmsg.txt
+6
-0
sql/share/hungarian/errmsg.txt
sql/share/hungarian/errmsg.txt
+6
-0
sql/share/italian/errmsg.txt
sql/share/italian/errmsg.txt
+6
-0
sql/share/japanese/errmsg.txt
sql/share/japanese/errmsg.txt
+6
-0
sql/share/korean/errmsg.txt
sql/share/korean/errmsg.txt
+6
-0
sql/share/norwegian-ny/errmsg.txt
sql/share/norwegian-ny/errmsg.txt
+6
-0
sql/share/norwegian/errmsg.txt
sql/share/norwegian/errmsg.txt
+6
-0
sql/share/polish/errmsg.txt
sql/share/polish/errmsg.txt
+6
-0
sql/share/portuguese/errmsg.txt
sql/share/portuguese/errmsg.txt
+6
-0
sql/share/romanian/errmsg.txt
sql/share/romanian/errmsg.txt
+6
-0
sql/share/russian/errmsg.txt
sql/share/russian/errmsg.txt
+6
-0
sql/share/serbian/errmsg.txt
sql/share/serbian/errmsg.txt
+6
-0
sql/share/slovak/errmsg.txt
sql/share/slovak/errmsg.txt
+6
-0
sql/share/spanish/errmsg.txt
sql/share/spanish/errmsg.txt
+6
-0
sql/share/swedish/errmsg.txt
sql/share/swedish/errmsg.txt
+6
-0
sql/share/ukrainian/errmsg.txt
sql/share/ukrainian/errmsg.txt
+6
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+7
-12
No files found.
include/mysqld_error.h
View file @
0f9e2c36
...
...
@@ -270,4 +270,11 @@
#define ER_SP_ALREADY_EXISTS 1251
#define ER_SP_DOES_NOT_EXIST 1252
#define ER_SP_DROP_FAILED 1253
#define ER_ERROR_MESSAGES 254
#define ER_SP_STORE_FAILED 1254
#define ER_SP_LEAVE_MISMATCH 1255
#define ER_SP_ITERATE_MISMATCH 1256
#define ER_SP_LABEL_REDEFINE 1257
#define ER_SP_LABEL_MISMATCH 1258
#define ER_SP_UNINIT_VAR 1259
#define ER_ERROR_MESSAGES 260
sql/share/czech/errmsg.txt
View file @
0f9e2c36
...
...
@@ -264,3 +264,9 @@ v/*
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/danish/errmsg.txt
View file @
0f9e2c36
...
...
@@ -258,3 +258,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/dutch/errmsg.txt
View file @
0f9e2c36
...
...
@@ -266,3 +266,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/english/errmsg.txt
View file @
0f9e2c36
...
...
@@ -255,4 +255,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"Failed to CREATE PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/estonian/errmsg.txt
View file @
0f9e2c36
...
...
@@ -260,3 +260,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/french/errmsg.txt
View file @
0f9e2c36
...
...
@@ -255,3 +255,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/german/errmsg.txt
View file @
0f9e2c36
...
...
@@ -265,3 +265,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/greek/errmsg.txt
View file @
0f9e2c36
...
...
@@ -255,3 +255,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/hungarian/errmsg.txt
View file @
0f9e2c36
...
...
@@ -257,3 +257,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/italian/errmsg.txt
View file @
0f9e2c36
...
...
@@ -255,3 +255,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/japanese/errmsg.txt
View file @
0f9e2c36
...
...
@@ -257,3 +257,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/korean/errmsg.txt
View file @
0f9e2c36
...
...
@@ -255,3 +255,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/norwegian-ny/errmsg.txt
View file @
0f9e2c36
...
...
@@ -257,3 +257,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/norwegian/errmsg.txt
View file @
0f9e2c36
...
...
@@ -257,3 +257,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/polish/errmsg.txt
View file @
0f9e2c36
...
...
@@ -259,3 +259,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/portuguese/errmsg.txt
View file @
0f9e2c36
...
...
@@ -255,3 +255,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/romanian/errmsg.txt
View file @
0f9e2c36
...
...
@@ -259,3 +259,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/russian/errmsg.txt
View file @
0f9e2c36
...
...
@@ -258,3 +258,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/serbian/errmsg.txt
View file @
0f9e2c36
...
...
@@ -251,3 +251,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/slovak/errmsg.txt
View file @
0f9e2c36
...
...
@@ -263,3 +263,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/spanish/errmsg.txt
View file @
0f9e2c36
...
...
@@ -256,3 +256,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/swedish/errmsg.txt
View file @
0f9e2c36
...
...
@@ -255,3 +255,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/share/ukrainian/errmsg.txt
View file @
0f9e2c36
...
...
@@ -260,3 +260,9 @@
"PROCEDURE already exists"
"PROCEDURE does not exist"
"Failed to DROP PROCEDURE"
"Failed to store PROCEDURE"
"LEAVE with no matching label"
"ITERATE with no matching label"
"Redefining label"
"End-label without match"
"Referring to uninitialized variable"
sql/sql_yacc.yy
View file @
0f9e2c36
...
...
@@ -1097,7 +1097,7 @@ sp_proc_stmt:
if (! lab)
{
printf("QQ LEAVE with no matching label\n"
);
send_error(YYTHD, ER_SP_LEAVE_MISMATCH
);
YYABORT;
}
else
...
...
@@ -1115,7 +1115,7 @@ sp_proc_stmt:
if (! lab)
{
printf("QQ ITERATE with no matching label\n"
);
send_error(YYTHD, ER_SP_ITERATE_MISMATCH
);
YYABORT;
}
else
...
...
@@ -1217,7 +1217,7 @@ sp_labeled_control:
if (lab)
{
printf("QQ Redefining label\n"
);
send_error(YYTHD, ER_SP_LABEL_REDEFINE
);
YYABORT;
}
else
...
...
@@ -1231,14 +1231,9 @@ sp_labeled_control:
LEX *lex= Lex;
sp_label_t *lab= lex->spcont->find_label($5.str);
if (! lab)
if (! lab
|| strcasecmp($5.str, lab->name) != 0
)
{
printf("QQ end-label without match\n");
YYABORT;
}
else if (strcasecmp($5.str, lab->name) != 0)
{
printf("QQ mismatching labels\n");
send_error(YYTHD, ER_SP_LABEL_MISMATCH);
YYABORT;
}
else
...
...
@@ -4158,8 +4153,8 @@ simple_ident:
{ /* We're compiling a stored procedure and found a variable */
if (lex->sql_command != SQLCOM_CALL && ! spv->isset)
{
printf("QQ Referring to an unitialized variable\n"
);
YYABORT;
/* QQ Referring to an unitialized variable */
send_error(YYTHD, ER_SP_UNINIT_VAR
);
YYABORT;
}
else
$$ = (Item*) new Item_splocal(spv->offset);
...
...
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