database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.0 -> 10.1

Browse Source
This commit is contained in:
Kristian Nielsen
2015-04-20 13:21:58 +02:00
parent c6d08ecce3 519ad0f7e3
commit 791b0ab5db
41 changed files with 1196 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_repl.cc
View File

@ -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);