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/sql_repl.cc | |
| parent | c6d08ecce3e7c18ecaae973c67bd2e547e0db4dd (diff) | |
| parent | 519ad0f7e35ff4dd13aac3c13da44c649f724352 (diff) | |
| download | mariadb-git-791b0ab5db47528d93cdaf534114e417ff06b66a.tar.gz | |
Merge 10.0 -> 10.1
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 3ce9ea8a2cc..d9ae6cad111 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1013,7 +1013,7 @@ give_error_start_pos_missing_in_binlog(int *err, const char **errormsg, binlog_gtid.seq_no >= error_gtid->seq_no) { *errormsg= "Requested slave GTID state not found in binlog. The slave has " - "probably diverged due to executing errorneous transactions"; + "probably diverged due to executing erroneous transactions"; *err= ER_GTID_POSITION_NOT_FOUND_IN_BINLOG2; } else @@ -2908,7 +2908,7 @@ err: "%u-%u-%llu, which is not in the master's binlog. Since the " "master's binlog contains GTIDs with higher sequence numbers, " "it probably means that the slave has diverged due to " - "executing extra errorneous transactions", + "executing extra erroneous transactions", info->error_gtid.domain_id, info->error_gtid.server_id, info->error_gtid.seq_no); |