diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-06-25 15:17:03 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-06-25 15:17:03 +0200 |
| commit | 86362129a2f70349cc79adb0825d5bc8f9a61f27 (patch) | |
| tree | 85d72a6ee651f847400b98e8f1016b74dc51460e /sql/rpl_utility.h | |
| parent | 00467e136e5080e8c175019534ad198b7dcc35d3 (diff) | |
| download | mariadb-git-86362129a2f70349cc79adb0825d5bc8f9a61f27.tar.gz | |
MDEV-6120: When slave stops with error, error message should indicate the failing GTID
If replication breaks in GTID mode, it is not trivial to determine the GTID of
the failing event group. This is a problem, as such GTID is needed eg. to
explicitly set @@gtid_slave_pos to skip to after that event group, or to
compare errors on different servers, etc.
Fix by ensuring that relevant slave errors logged to the error log include the
GTID of the event group containing the problem event.
Diffstat (limited to 'sql/rpl_utility.h')
| -rw-r--r-- | sql/rpl_utility.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h index 7568a2d786c..ed0ce16363b 100644 --- a/sql/rpl_utility.h +++ b/sql/rpl_utility.h @@ -30,6 +30,7 @@ class Relay_log_info; class Log_event; +struct rpl_group_info; /** A table definition from the master. @@ -187,7 +188,7 @@ public: @retval 0 if the table definition is compatible with @c table */ #ifndef MYSQL_CLIENT - bool compatible_with(THD *thd, Relay_log_info *rli, TABLE *table, + bool compatible_with(THD *thd, rpl_group_info *rgi, TABLE *table, TABLE **conv_table_var) const; /** @@ -212,7 +213,8 @@ public: @return A pointer to a temporary table with memory allocated in the thread's memroot, NULL if the table could not be created */ - TABLE *create_conversion_table(THD *thd, Relay_log_info *rli, TABLE *target_table) const; + TABLE *create_conversion_table(THD *thd, rpl_group_info *rgi, + TABLE *target_table) const; #endif |