summaryrefslogtreecommitdiff
path: root/sql/sp.h
diff options
context:
space:
mode:
authorpem@mysql.com <>2005-12-06 13:34:18 +0100
committerpem@mysql.com <>2005-12-06 13:34:18 +0100
commita0ed1d5aba66f9ca677877a42f2d72e318906486 (patch)
tree22e589d866e2e6c9864012307d0df61496105a96 /sql/sp.h
parentdf4887308967a0d21acad7c7fbc0817b6fa52cb1 (diff)
parenteb5bf2ec338379645cd8dd260de51f8ccbd46aa1 (diff)
downloadmariadb-git-a0ed1d5aba66f9ca677877a42f2d72e318906486.tar.gz
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/bug14233/mysql-5.0
Diffstat (limited to 'sql/sp.h')
-rw-r--r--sql/sp.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sp.h b/sql/sp.h
index 7f314b8903e..235eb5cba37 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -84,11 +84,11 @@ void sp_add_used_routine(LEX *lex, Query_arena *arena,
sp_name *rt, char rt_type);
void sp_remove_not_own_routines(LEX *lex);
void sp_update_sp_used_routines(HASH *dst, HASH *src);
-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,
+int sp_cache_routines_and_add_tables(THD *thd, LEX *lex,
+ bool first_no_prelock, bool *tabs_changed);
+int sp_cache_routines_and_add_tables_for_view(THD *thd, LEX *lex,
+ LEX *aux_lex);
+int sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,
Table_triggers_list *triggers);
extern "C" byte* sp_sroutine_key(const byte *ptr, uint *plen, my_bool first);