MDEV-6247: Merge 10.0-galera to 10.1.

Merged lp:maria/maria-10.0-galera up to revision 3879.

Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.

1 files changed, 15 insertions, 0 deletions

diff --git a/sql/sp.h b/sql/sp.h
index 3353132346b..de32b5454f8 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -214,4 +214,19 @@ bool load_collation(MEM_ROOT *mem_root,
                     CHARSET_INFO *dflt_cl,
                     CHARSET_INFO **cl);
 
+void sp_returns_type(THD *thd,
+                     String &result,
+                     sp_head *sp);
+
+bool create_string(THD *thd, String *buf,
+              stored_procedure_type type,
+              const char *db, ulong dblen,
+              const char *name, ulong namelen,
+              const char *params, ulong paramslen,
+              const char *returns, ulong returnslen,
+              const char *body, ulong bodylen,
+              st_sp_chistics *chistics,
+              const LEX_STRING *definer_user,
+              const LEX_STRING *definer_host,
+	      ulonglong sql_mode);
 #endif /* _SP_H_ */