summaryrefslogtreecommitdiff
path: root/sql/sp.h
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2005-08-03 10:14:01 +0000
committerunknown <sergefp@mysql.com>2005-08-03 10:14:01 +0000
commit3ca396cdd1746dfb5f6a41bde28726125c61ef05 (patch)
tree4a75afdb46af19a11257aec690a29e247644541c /sql/sp.h
parentec9470b5525b33bacd77f279a0a975e529373bf5 (diff)
parent91ad19d26c76250b1f0107fb69bab12d111f5858 (diff)
downloadmariadb-git-3ca396cdd1746dfb5f6a41bde28726125c61ef05.tar.gz
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-sp-no-lock-r7 sql/sp.cc: Auto merged sql/sp.h: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'sql/sp.h')
-rw-r--r--sql/sp.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sp.h b/sql/sp.h
index 86351f61de9..58244c34761 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -80,10 +80,13 @@ sp_show_status_function(THD *thd, const char *wild);
Procedures for pre-caching of stored routines and building table list
for prelocking.
*/
+void sp_get_prelocking_info(THD *thd, bool *need_prelocking,
+ bool *first_no_prelocking);
void sp_add_used_routine(LEX *lex, Query_arena *arena,
sp_name *rt, char rt_type);
void sp_update_sp_used_routines(HASH *dst, HASH *src);
-bool sp_cache_routines_and_add_tables(THD *thd, LEX *lex);
+bool sp_cache_routines_and_add_tables(THD *thd, LEX *lex,
+ bool first_no_prelock);
void sp_cache_routines_and_add_tables_for_view(THD *thd, LEX *lex,
LEX *aux_lex);
void sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,