diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-26 20:49:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-28 16:37:06 +0200 |
| commit | 57e0da50bbef8164635317785b67dd468a908327 (patch) | |
| tree | 89d1ed179afce8b040c8f2dfcfe179042ff27b2e /sql/wsrep_mysqld.h | |
| parent | 7aba6f8f8853acd18d471793f8b72aa1412b8151 (diff) | |
| parent | dcbd51cee628d8d8fec9ff5476a6afc855b007aa (diff) | |
| download | mariadb-git-57e0da50bbef8164635317785b67dd468a908327.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 6aa8a68f222..819a56b9f23 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -159,7 +159,6 @@ extern "C" time_t wsrep_thd_query_start(THD *thd); extern "C" query_id_t wsrep_thd_query_id(THD *thd); extern "C" query_id_t wsrep_thd_wsrep_last_query_id(THD *thd); extern "C" void wsrep_thd_set_wsrep_last_query_id(THD *thd, query_id_t id); -extern "C" void wsrep_set_data_home_dir(const char *data_dir); extern void wsrep_close_client_connections(my_bool wait_to_end); extern int wsrep_wait_committing_connections_close(int wait_time); @@ -286,8 +285,10 @@ extern PSI_mutex_key key_LOCK_wsrep_desync; extern PSI_file_key key_file_wsrep_gra_log; #endif /* HAVE_PSI_INTERFACE */ struct TABLE_LIST; +class Alter_info; int wsrep_to_isolation_begin(THD *thd, const char *db_, const 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( |