diff options
author | Alexey Botchkov <holyfoot@mysql.com> | 2009-04-29 07:59:10 +0500 |
---|---|---|
committer | Alexey Botchkov <holyfoot@mysql.com> | 2009-04-29 07:59:10 +0500 |
commit | 0e88c80580b244a960afd39408f4a459c555fb56 (patch) | |
tree | 4f09cda898568a4480e2d228438c4b9befbdd3b8 /sql/sp_pcontext.h | |
parent | 755d312e8456da751f432fd0e9c211dc4aeba131 (diff) | |
parent | ddc9a195508c35fc3f83ce58327b5fe7f09f4277 (diff) | |
download | mariadb-git-0e88c80580b244a960afd39408f4a459c555fb56.tar.gz |
merging
Diffstat (limited to 'sql/sp_pcontext.h')
-rw-r--r-- | sql/sp_pcontext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h index aefc501b3b0..3145ba2fea4 100644 --- a/sql/sp_pcontext.h +++ b/sql/sp_pcontext.h @@ -323,7 +323,7 @@ public: // Conditions // - void + int push_cond(LEX_STRING *name, sp_cond_type_t *val); inline void @@ -365,7 +365,7 @@ public: // Cursors // - void + int push_cursor(LEX_STRING *name); my_bool |