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
c6fc5d35
Commit
c6fc5d35
authored
Dec 06, 2005
by
pem@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Final review fix of #14233: Crash after tampering with the mysql.proc table.
Changed variable type and added comment in sp.c.
parent
a0ed1d5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
sql/sp.cc
sql/sp.cc
+6
-1
No files found.
sql/sp.cc
View file @
c6fc5d35
...
@@ -1462,7 +1462,7 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
...
@@ -1462,7 +1462,7 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
bool
first_no_prelock
,
bool
*
tabs_changed
)
bool
first_no_prelock
,
bool
*
tabs_changed
)
{
{
int
ret
=
0
;
int
ret
=
0
;
int
tabschnd
=
0
;
/* Set if tables changed */
bool
tabschnd
=
0
;
/* Set if tables changed */
bool
first
=
TRUE
;
bool
first
=
TRUE
;
DBUG_ENTER
(
"sp_cache_routines_and_add_tables_aux"
);
DBUG_ENTER
(
"sp_cache_routines_and_add_tables_aux"
);
...
@@ -1512,6 +1512,11 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
...
@@ -1512,6 +1512,11 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
*/
*/
if
(
ret
==
SP_PARSE_ERROR
)
if
(
ret
==
SP_PARSE_ERROR
)
thd
->
clear_error
();
thd
->
clear_error
();
/*
If we cleared the parse error, or when db_find_routine() flagged
an error with it's return value without calling my_error(), we
set the generic "mysql.proc table corrupt" error here.
*/
if
(
!
thd
->
net
.
report_error
)
if
(
!
thd
->
net
.
report_error
)
{
{
char
n
[
NAME_LEN
*
2
+
2
];
char
n
[
NAME_LEN
*
2
+
2
];
...
...
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