Skip to content

Commit f640527

Browse files
vuvovavuvova
committed
typo fixed: s/MSYQL/MYSQL/
1 parent 9976223 commit f640527

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎mysql-test/suite/binlog/r/binlog_index.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
call mtr.add_suppression('Attempting backtrace');
2-
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
3-
call mtr.add_suppression('MSYQL_BIN_LOG::open failed to sync the index file');
2+
call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
3+
call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file');
44
call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.');
55
call mtr.add_suppression('Could not open .*');
6-
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
6+
call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
77
flush tables;
88
RESET MASTER;
99
flush logs;

‎mysql-test/suite/binlog/t/binlog_index.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ source include/have_debug.inc;
99
# Avoid CrashReporter popup on Mac
1010
--source include/not_crashrep.inc
1111
call mtr.add_suppression('Attempting backtrace');
12-
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
13-
call mtr.add_suppression('MSYQL_BIN_LOG::open failed to sync the index file');
12+
call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
13+
call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file');
1414
call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.');
1515
call mtr.add_suppression('Could not open .*');
16-
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
16+
call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
1717
flush tables;
1818

1919
let $old=`select @@debug`;

‎mysql-test/suite/rpl/r/rpl_binlog_errors.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ count(*)
169169
SET SQL_LOG_BIN=1;
170170
SET GLOBAL debug_dbug="-d,error_unique_log_filename";
171171
###################### TEST #10
172-
call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file.");
172+
call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
173173
call mtr.add_suppression("Could not open .*");
174174
RESET MASTER;
175175
SHOW WARNINGS;
@@ -226,7 +226,7 @@ include/rpl_reset.inc
226226
call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*");
227227
call mtr.add_suppression("Error writing file .*");
228228
call mtr.add_suppression("Could not open .*");
229-
call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file.");
229+
call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
230230
call mtr.add_suppression("Can't generate a unique log-filename .*");
231231
###################### TEST #13
232232
SET @old_debug=@@global.debug;

‎mysql-test/suite/rpl/t/rpl_binlog_errors.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ SET GLOBAL debug_dbug="-d,error_unique_log_filename";
256256
### while registering the index file and the binary log
257257
### file or failure to write the rotate event.
258258

259-
call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file.");
259+
call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
260260
call mtr.add_suppression("Could not open .*");
261261

262262
RESET MASTER;
@@ -362,7 +362,7 @@ RESET MASTER;
362362
call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*");
363363
call mtr.add_suppression("Error writing file .*");
364364
call mtr.add_suppression("Could not open .*");
365-
call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file.");
365+
call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
366366
call mtr.add_suppression("Can't generate a unique log-filename .*");
367367
-- echo ###################### TEST #13
368368

‎sql/log.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,7 +3059,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
30593059
if (init_and_set_log_file_name(log_name, new_name, log_type_arg,
30603060
io_cache_type_arg))
30613061
{
3062-
sql_print_error("MSYQL_BIN_LOG::open failed to generate new file name.");
3062+
sql_print_error("MYSQL_BIN_LOG::open failed to generate new file name.");
30633063
DBUG_RETURN(1);
30643064
}
30653065

@@ -3086,7 +3086,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
30863086
}
30873087
});
30883088

3089-
sql_print_error("MSYQL_BIN_LOG::open failed to sync the index file.");
3089+
sql_print_error("MYSQL_BIN_LOG::open failed to sync the index file.");
30903090
DBUG_RETURN(1);
30913091
}
30923092
DBUG_EXECUTE_IF("crash_create_non_critical_before_update_index", DBUG_SUICIDE(););
@@ -3849,14 +3849,14 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
38493849

38503850
if ((error= sync_purge_index_file()))
38513851
{
3852-
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to flush register file.");
3852+
sql_print_error("MYSQL_BIN_LOG::purge_logs failed to flush register file.");
38533853
goto err;
38543854
}
38553855

38563856
/* We know how many files to delete. Update index file. */
38573857
if ((error=update_log_index(&log_info, need_update_threads)))
38583858
{
3859-
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to update the index file");
3859+
sql_print_error("MYSQL_BIN_LOG::purge_logs failed to update the index file");
38603860
goto err;
38613861
}
38623862

@@ -3866,7 +3866,7 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
38663866
/* Read each entry from purge_index_file and delete the file. */
38673867
if (is_inited_purge_index_file() &&
38683868
(error= purge_index_entry(thd, reclaimed_space, FALSE)))
3869-
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to process registered files"
3869+
sql_print_error("MYSQL_BIN_LOG::purge_logs failed to process registered files"
38703870
" that would be purged.");
38713871
close_purge_index_file();
38723872

@@ -3983,7 +3983,7 @@ int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *reclaimed_space,
39833983

39843984
if ((error=reinit_io_cache(&purge_index_file, READ_CACHE, 0, 0, 0)))
39853985
{
3986-
sql_print_error("MSYQL_BIN_LOG::purge_index_entry failed to reinit register file "
3986+
sql_print_error("MYSQL_BIN_LOG::purge_index_entry failed to reinit register file "
39873987
"for read");
39883988
goto err;
39893989
}
@@ -3998,7 +3998,7 @@ int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *reclaimed_space,
39983998
if (purge_index_file.error)
39993999
{
40004000
error= purge_index_file.error;
4001-
sql_print_error("MSYQL_BIN_LOG::purge_index_entry error %d reading from "
4001+
sql_print_error("MYSQL_BIN_LOG::purge_index_entry error %d reading from "
40024002
"register file.", error);
40034003
goto err;
40044004
}

0 commit comments

Comments
 (0)