diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-01-15 13:01:19 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-01-15 13:01:19 +0100 |
| commit | 2f88b14acd9c7ddc0337dd56a1d6ce1a156fe4ce (patch) | |
| tree | 0243e9e4f7d4c5bddd081b84018a60702f0f4810 /sql/share | |
| parent | 55d61ec878f94cfbdafee43599809dda98803a9f (diff) | |
| parent | 06b2e327fcb9ee8737e66cf0893766df41c9d8f8 (diff) | |
| download | mariadb-git-2f88b14acd9c7ddc0337dd56a1d6ce1a156fe4ce.tar.gz | |
Merge branch 'tmp' into tmp-10.1
Conflicts:
sql/slave.cc
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 59908dc51c0..9482bd56926 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7106,7 +7106,7 @@ ER_PRIOR_COMMIT_FAILED ER_IT_IS_A_VIEW 42S02 eng "'%-.192s' is a view" ER_SLAVE_SKIP_NOT_IN_GTID - eng "When using GTID, @@sql_slave_skip_counter can not be used. Instead, setting @@gtid_slave_pos explicitly can be used to skip to after a given GTID position." + eng "When using parallel replication and GTID with multiple replication domains, @@sql_slave_skip_counter can not be used. Instead, setting @@gtid_slave_pos explicitly can be used to skip to after a given GTID position." ER_TABLE_DEFINITION_TOO_BIG eng "The definition for table %`s is too big" ER_PLUGIN_INSTALLED |