summaryrefslogtreecommitdiff
path: root/sql/wsrep_mysqld.h
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2018-08-02 13:13:21 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2018-08-02 13:13:21 +0300
commit9b29bda0d67ab15299659c9ad4046ab4f5ca7b6a (patch)
tree32e23a8486149f0054dfe6937a2966212c621c35 /sql/wsrep_mysqld.h
parentc5a8583b3146613429d88c1c044de88a4c4c94b0 (diff)
parente88e26b4242e1c030bb138fca7ea2c916dbe6a76 (diff)
downloadmariadb-git-9b29bda0d67ab15299659c9ad4046ab4f5ca7b6a.tar.gz
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/wsrep_mysqld.h')
-rw-r--r--sql/wsrep_mysqld.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h
index ee96a304f7b..49845a8fafb 100644
--- a/sql/wsrep_mysqld.h
+++ b/sql/wsrep_mysqld.h
@@ -326,8 +326,10 @@ extern PSI_mutex_key key_LOCK_wsrep_slave_threads;
extern PSI_mutex_key key_LOCK_wsrep_desync;
#endif /* HAVE_PSI_INTERFACE */
struct TABLE_LIST;
+class Alter_info;
int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_,
- const TABLE_LIST* table_list);
+ const TABLE_LIST* table_list,
+ Alter_info* alter_info = NULL);
void wsrep_to_isolation_end(THD *thd);
void wsrep_cleanup_transaction(THD *thd);
int wsrep_to_buf_helper(