database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

typo fixed: s/MSYQL/MYSQL/

Browse Source
This commit is contained in:
Sergei Golubchik
2016-12-02 15:22:11 +01:00
parent 9976223c00
commit f640527e65
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/binlog/r/binlog_index.result
View File

@ -1,9 +1,9 @@
call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
call mtr.add_suppression('MSYQL_BIN_LOG::open failed to sync the index file'); call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file');
call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.'); call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.');
call mtr.add_suppression('Could not open .*'); call mtr.add_suppression('Could not open .*');
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to clean registers before purging logs.'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
flush tables; flush tables;
RESET MASTER; RESET MASTER;
flush logs; flush logs;

6
mysql-test/suite/binlog/t/binlog_index.test
View File

@ -9,11 +9,11 @@ source include/have_debug.inc;
# Avoid CrashReporter popup on Mac # Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc --source include/not_crashrep.inc
call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
call mtr.add_suppression('MSYQL_BIN_LOG::open failed to sync the index file'); call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file');
call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.'); call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.');
call mtr.add_suppression('Could not open .*'); call mtr.add_suppression('Could not open .*');
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to clean registers before purging logs.'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
flush tables; flush tables;
let $old=`select @@debug`; let $old=`select @@debug`;

4
mysql-test/suite/rpl/r/rpl_binlog_errors.result
View File

@ -169,7 +169,7 @@ count(*)
SET SQL_LOG_BIN=1; SET SQL_LOG_BIN=1;
SET GLOBAL debug_dbug="-d,error_unique_log_filename"; SET GLOBAL debug_dbug="-d,error_unique_log_filename";
###################### TEST #10 ###################### TEST #10
call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file."); call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
call mtr.add_suppression("Could not open .*"); call mtr.add_suppression("Could not open .*");
RESET MASTER; RESET MASTER;
SHOW WARNINGS; SHOW WARNINGS;
@ -226,7 +226,7 @@ include/rpl_reset.inc
call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*"); call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*");
call mtr.add_suppression("Error writing file .*"); call mtr.add_suppression("Error writing file .*");
call mtr.add_suppression("Could not open .*"); call mtr.add_suppression("Could not open .*");
call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file."); call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
call mtr.add_suppression("Can't generate a unique log-filename .*"); call mtr.add_suppression("Can't generate a unique log-filename .*");
###################### TEST #13 ###################### TEST #13
SET @old_debug=@@global.debug; SET @old_debug=@@global.debug;

4
mysql-test/suite/rpl/t/rpl_binlog_errors.test
View File

@ -256,7 +256,7 @@ SET GLOBAL debug_dbug="-d,error_unique_log_filename";
### while registering the index file and the binary log ### while registering the index file and the binary log
### file or failure to write the rotate event. ### file or failure to write the rotate event.
call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file."); call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
call mtr.add_suppression("Could not open .*"); call mtr.add_suppression("Could not open .*");
RESET MASTER; RESET MASTER;
@ -362,7 +362,7 @@ RESET MASTER;
call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*"); call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*");
call mtr.add_suppression("Error writing file .*"); call mtr.add_suppression("Error writing file .*");
call mtr.add_suppression("Could not open .*"); call mtr.add_suppression("Could not open .*");
call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file."); call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
call mtr.add_suppression("Can't generate a unique log-filename .*"); call mtr.add_suppression("Can't generate a unique log-filename .*");
-- echo ###################### TEST #13 -- echo ###################### TEST #13

14
sql/log.cc
View File

@ -3059,7 +3059,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
if (init_and_set_log_file_name(log_name, new_name, log_type_arg, if (init_and_set_log_file_name(log_name, new_name, log_type_arg,
io_cache_type_arg)) io_cache_type_arg))
{ {
sql_print_error("MSYQL_BIN_LOG::open failed to generate new file name."); sql_print_error("MYSQL_BIN_LOG::open failed to generate new file name.");
DBUG_RETURN(1); DBUG_RETURN(1);
} }
@ -3086,7 +3086,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
} }
}); });
sql_print_error("MSYQL_BIN_LOG::open failed to sync the index file."); sql_print_error("MYSQL_BIN_LOG::open failed to sync the index file.");
DBUG_RETURN(1); DBUG_RETURN(1);
} }
DBUG_EXECUTE_IF("crash_create_non_critical_before_update_index", DBUG_SUICIDE();); 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,
if ((error= sync_purge_index_file())) if ((error= sync_purge_index_file()))
{ {
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to flush register file."); sql_print_error("MYSQL_BIN_LOG::purge_logs failed to flush register file.");
goto err; goto err;
} }
/* We know how many files to delete. Update index file. */ /* We know how many files to delete. Update index file. */
if ((error=update_log_index(&log_info, need_update_threads))) if ((error=update_log_index(&log_info, need_update_threads)))
{ {
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to update the index file"); sql_print_error("MYSQL_BIN_LOG::purge_logs failed to update the index file");
goto err; goto err;
} }
@ -3866,7 +3866,7 @@ err:
/* Read each entry from purge_index_file and delete the file. */ /* Read each entry from purge_index_file and delete the file. */
if (is_inited_purge_index_file() && if (is_inited_purge_index_file() &&
(error= purge_index_entry(thd, reclaimed_space, FALSE))) (error= purge_index_entry(thd, reclaimed_space, FALSE)))
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to process registered files" sql_print_error("MYSQL_BIN_LOG::purge_logs failed to process registered files"
" that would be purged."); " that would be purged.");
close_purge_index_file(); close_purge_index_file();
@ -3983,7 +3983,7 @@ int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *reclaimed_space,
if ((error=reinit_io_cache(&purge_index_file, READ_CACHE, 0, 0, 0))) if ((error=reinit_io_cache(&purge_index_file, READ_CACHE, 0, 0, 0)))
{ {
sql_print_error("MSYQL_BIN_LOG::purge_index_entry failed to reinit register file " sql_print_error("MYSQL_BIN_LOG::purge_index_entry failed to reinit register file "
"for read"); "for read");
goto err; goto err;
} }
@ -3998,7 +3998,7 @@ int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *reclaimed_space,
if (purge_index_file.error) if (purge_index_file.error)
{ {
error= purge_index_file.error; error= purge_index_file.error;
sql_print_error("MSYQL_BIN_LOG::purge_index_entry error %d reading from " sql_print_error("MYSQL_BIN_LOG::purge_index_entry error %d reading from "
"register file.", error); "register file.", error);
goto err; goto err;
} }