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:
Sergei Golubchik 2015-09-03 12:58:41 +02:00
commit 530a6e7481
361 changed files with 9482 additions and 4583 deletions

View file

@ -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);