diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 13:21:58 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 13:21:58 +0200 |
| commit | 791b0ab5db47528d93cdaf534114e417ff06b66a (patch) | |
| tree | b47e7bc501a73ce95328dddced35b891d5ac21ba /sql/log.h | |
| parent | c6d08ecce3e7c18ecaae973c67bd2e547e0db4dd (diff) | |
| parent | 519ad0f7e35ff4dd13aac3c13da44c649f724352 (diff) | |
| download | mariadb-git-791b0ab5db47528d93cdaf534114e417ff06b66a.tar.gz | |
Merge 10.0 -> 10.1
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.h b/sql/log.h index 8b2228f75cf..7a4370d8b76 100644 --- a/sql/log.h +++ b/sql/log.h @@ -695,6 +695,7 @@ public: void set_max_size(ulong max_size_arg); void signal_update(); void wait_for_sufficient_commits(); + void binlog_trigger_immediate_group_commit(); void wait_for_update_relay_log(THD* thd); int wait_for_update_bin_log(THD* thd, const struct timespec * timeout); void init(ulong max_size); @@ -1071,6 +1072,7 @@ bool general_log_print(THD *thd, enum enum_server_command command, bool general_log_write(THD *thd, enum enum_server_command command, const char *query, uint query_length); +void binlog_report_wait_for(THD *thd, THD *other_thd); void sql_perror(const char *message); bool flush_error_log(); |