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

MDEV-7785: errorneous -> erroneous spelling mistake

Browse Source
This commit is contained in:
Kristian Nielsen
2015-03-16 10:54:47 +01:00
parent 184f718fef
commit 2e82a8233c
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result
View File

@ -179,7 +179,7 @@ a
SET sql_log_bin=0; SET sql_log_bin=0;
CALL mtr.add_suppression("Slave: Could not update replication slave gtid state"); CALL mtr.add_suppression("Slave: Could not update replication slave gtid state");
SET sql_log_bin=1; SET sql_log_bin=1;
*** MDEV-4906: When event apply fails, next SQL thread start errorneously commits the failing GTID to gtid_slave_pos *** *** MDEV-4906: When event apply fails, next SQL thread start erroneously commits the failing GTID to gtid_slave_pos ***
include/stop_slave.inc include/stop_slave.inc
SET sql_log_bin=0; SET sql_log_bin=0;
DELETE FROM t2; DELETE FROM t2;

2
mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test
View File

@ -230,7 +230,7 @@ CALL mtr.add_suppression("Slave: Could not update replication slave gtid state")
SET sql_log_bin=1; SET sql_log_bin=1;
--echo *** MDEV-4906: When event apply fails, next SQL thread start errorneously commits the failing GTID to gtid_slave_pos *** --echo *** MDEV-4906: When event apply fails, next SQL thread start erroneously commits the failing GTID to gtid_slave_pos ***
--connection slave --connection slave
--source include/stop_slave.inc --source include/stop_slave.inc

2
sql/rpl_rli.cc
View File

@ -1769,7 +1769,7 @@ void rpl_group_info::cleanup_context(THD *thd, bool error)
trans_rollback(thd); // if a "real transaction" trans_rollback(thd); // if a "real transaction"
/* /*
Now that we have rolled back the transaction, make sure we do not Now that we have rolled back the transaction, make sure we do not
errorneously update the GTID position. erroneously update the GTID position.
*/ */
gtid_pending= false; gtid_pending= false;
} }

2
sql/share/errmsg-utf8.txt
View File

@ -7080,7 +7080,7 @@ ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_GTID_DOMAIN_ID_SEQ_NO
ER_STORED_FUNCTION_PREVENTS_SWITCH_GTID_DOMAIN_ID_SEQ_NO ER_STORED_FUNCTION_PREVENTS_SWITCH_GTID_DOMAIN_ID_SEQ_NO
eng "Cannot modify @@session.gtid_domain_id or @@session.gtid_seq_no inside a stored function or trigger" eng "Cannot modify @@session.gtid_domain_id or @@session.gtid_seq_no inside a stored function or trigger"
ER_GTID_POSITION_NOT_FOUND_IN_BINLOG2 ER_GTID_POSITION_NOT_FOUND_IN_BINLOG2
eng "Connecting slave requested to start from GTID %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" eng "Connecting slave requested to start from GTID %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 erroneous transactions"
ER_BINLOG_MUST_BE_EMPTY ER_BINLOG_MUST_BE_EMPTY
eng "This operation is not allowed if any GTID has been logged to the binary log. Run RESET MASTER first to erase the log" eng "This operation is not allowed if any GTID has been logged to the binary log. Run RESET MASTER first to erase the log"
ER_NO_SUCH_QUERY ER_NO_SUCH_QUERY

2
sql/slave.cc
View File

@ -3352,7 +3352,7 @@ int apply_event_and_update_pos(Log_event* ev, THD* thd,
else else
{ {
/* /*
Make sure we do not errorneously update gtid_slave_pos with a lingering Make sure we do not erroneously update gtid_slave_pos with a lingering
GTID from this failed event group (MDEV-4906). GTID from this failed event group (MDEV-4906).
*/ */
rgi->gtid_pending= false; rgi->gtid_pending= false;

4
sql/sql_repl.cc
View File

@ -943,7 +943,7 @@ give_error_start_pos_missing_in_binlog(int *err, const char **errormsg,
binlog_gtid.seq_no >= error_gtid->seq_no) binlog_gtid.seq_no >= error_gtid->seq_no)
{ {
*errormsg= "Requested slave GTID state not found in binlog. The slave has " *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; *err= ER_GTID_POSITION_NOT_FOUND_IN_BINLOG2;
} }
else else
@ -2751,7 +2751,7 @@ err:
"%u-%u-%llu, which is not in the master's binlog. Since the " "%u-%u-%llu, which is not in the master's binlog. Since the "
"master's binlog contains GTIDs with higher sequence numbers, " "master's binlog contains GTIDs with higher sequence numbers, "
"it probably means that the slave has diverged due to " "it probably means that the slave has diverged due to "
"executing extra errorneous transactions", "executing extra erroneous transactions",
error_gtid.domain_id, error_gtid.server_id, error_gtid.seq_no); error_gtid.domain_id, error_gtid.server_id, error_gtid.seq_no);
/* Use this error code so slave will know not to try reconnect. */ /* Use this error code so slave will know not to try reconnect. */
my_errno = ER_MASTER_FATAL_ERROR_READING_BINLOG; my_errno = ER_MASTER_FATAL_ERROR_READING_BINLOG;