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
35223ca3
Commit
35223ca3
authored
Apr 06, 2007
by
tomas@whalegate.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents
77a1d31f
09cfc052
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
sql/parse_file.cc
sql/parse_file.cc
+13
-2
sql/sp_head.cc
sql/sp_head.cc
+6
-0
No files found.
sql/parse_file.cc
View file @
35223ca3
...
...
@@ -726,7 +726,11 @@ nlist_err:
TABLE)
mem_root MEM_ROOT for parameters allocation
parameters parameters description
required number of required parameters in above list
required number of parameters in the above list. If the file
contains more parameters than "required", they will
be ignored. If the file contains less parameters
then "required", non-existing parameters will
remain their values.
hook hook called for unknown keys
hook_data some data specific for the hook
...
...
@@ -909,6 +913,13 @@ list_err:
}
}
}
/*
NOTE: if we read less than "required" parameters, it is still Ok.
Probably, we've just read the file of the previous version, which
contains less parameters.
*/
DBUG_RETURN
(
FALSE
);
}
...
...
sql/sp_head.cc
View file @
35223ca3
...
...
@@ -954,6 +954,12 @@ sp_head::execute(THD *thd)
m_first_instance
->
m_last_cached_sp
==
this
)
||
(
m_recursion_level
+
1
==
m_next_cached_sp
->
m_recursion_level
));
/*
NOTE: The SQL Standard does not specify the context that should be
preserved for stored routines. However, at SAP/Walldorf meeting it was
decided that current database should be preserved.
*/
if
(
m_db
.
length
&&
(
err_status
=
sp_use_new_db
(
thd
,
m_db
,
&
old_db
,
0
,
&
dbchanged
)))
goto
done
;
...
...
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