diff options
| author | Monty <monty@mariadb.org> | 2016-02-06 18:14:54 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-02-06 18:14:54 +0200 |
| commit | b2f8d7b41001a5da11b2d99a055a207c3911a213 (patch) | |
| tree | d108ed6d1f38543305235fec6a63228a5a2f08d5 /sql/sp_head.h | |
| parent | d4b3a199acb0ddcdedff441ae664b0a2cf2fe8d2 (diff) | |
| parent | 07b8aefe90ca830d2de068f2966cd2288b158a88 (diff) | |
| download | mariadb-git-b2f8d7b41001a5da11b2d99a055a207c3911a213.tar.gz | |
Merge branch '10.1' into 10.2
Conflicts:
VERSION
cmake/plugin.cmake
config.h.cmake
configure.cmake
plugin/server_audit/server_audit.c
sql/sql_yacc.yy
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 4e761c31d5b..9022f954d11 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -337,6 +337,9 @@ public: bool execute_procedure(THD *thd, List<Item> *args); + static void + show_create_routine_get_fields(THD *thd, int type, List<Item> *fields); + bool show_create_routine(THD *thd, int type); |