mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 21:25:36 +02:00
Merge branch '10.0' into 10.1
referenced_by_foreign_key2(), needed for InnoDB to compile, was taken from 10.0-galera
This commit is contained in:
commit
530a6e7481
361 changed files with 9482 additions and 4583 deletions
2
sql/sp.h
2
sql/sp.h
|
|
@ -121,7 +121,7 @@ sp_cache_routine(THD *thd, stored_procedure_type type, sp_name *name,
|
|||
bool lookup_only, sp_head **sp);
|
||||
|
||||
bool
|
||||
sp_exist_routines(THD *thd, TABLE_LIST *procs, bool any);
|
||||
sp_exist_routines(THD *thd, TABLE_LIST *procs, bool is_proc);
|
||||
|
||||
bool
|
||||
sp_show_create_routine(THD *thd, stored_procedure_type type, sp_name *name);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue