Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f640527e
Commit
f640527e
authored
Dec 02, 2016
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
typo fixed: s/MSYQL/MYSQL/
parent
9976223c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
17 deletions
+17
-17
mysql-test/suite/binlog/r/binlog_index.result
mysql-test/suite/binlog/r/binlog_index.result
+3
-3
mysql-test/suite/binlog/t/binlog_index.test
mysql-test/suite/binlog/t/binlog_index.test
+3
-3
mysql-test/suite/rpl/r/rpl_binlog_errors.result
mysql-test/suite/rpl/r/rpl_binlog_errors.result
+2
-2
mysql-test/suite/rpl/t/rpl_binlog_errors.test
mysql-test/suite/rpl/t/rpl_binlog_errors.test
+2
-2
sql/log.cc
sql/log.cc
+7
-7
No files found.
mysql-test/suite/binlog/r/binlog_index.result
View file @
f640527e
call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression('M
SY
QL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
call mtr.add_suppression('M
YS
QL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
call mtr.add_suppression('M
SY
QL_BIN_LOG::open failed to sync the index file');
call mtr.add_suppression('M
YS
QL_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('M
SY
QL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
call mtr.add_suppression('M
YS
QL_BIN_LOG::purge_logs failed to clean registers before purging logs.');
flush tables;
flush tables;
RESET MASTER;
RESET MASTER;
flush logs;
flush logs;
...
...
mysql-test/suite/binlog/t/binlog_index.test
View file @
f640527e
...
@@ -9,11 +9,11 @@ source include/have_debug.inc;
...
@@ -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
(
'M
SY
QL_BIN_LOG::purge_logs failed to process registered files that would be purged.'
);
call
mtr
.
add_suppression
(
'M
YS
QL_BIN_LOG::purge_logs failed to process registered files that would be purged.'
);
call
mtr
.
add_suppression
(
'M
SY
QL_BIN_LOG::open failed to sync the index file'
);
call
mtr
.
add_suppression
(
'M
YS
QL_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
(
'M
SY
QL_BIN_LOG::purge_logs failed to clean registers before purging logs.'
);
call
mtr
.
add_suppression
(
'M
YS
QL_BIN_LOG::purge_logs failed to clean registers before purging logs.'
);
flush
tables
;
flush
tables
;
let
$old
=
`select @@debug`
;
let
$old
=
`select @@debug`
;
...
...
mysql-test/suite/rpl/r/rpl_binlog_errors.result
View file @
f640527e
...
@@ -169,7 +169,7 @@ count(*)
...
@@ -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("M
SY
QL_BIN_LOG::open failed to sync the index file.");
call mtr.add_suppression("M
YS
QL_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
...
@@ -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("M
SY
QL_BIN_LOG::open failed to sync the index file.");
call mtr.add_suppression("M
YS
QL_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;
...
...
mysql-test/suite/rpl/t/rpl_binlog_errors.test
View file @
f640527e
...
@@ -256,7 +256,7 @@ SET GLOBAL debug_dbug="-d,error_unique_log_filename";
...
@@ -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
(
"M
SY
QL_BIN_LOG::open failed to sync the index file."
);
call
mtr
.
add_suppression
(
"M
YS
QL_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;
...
@@ -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
(
"M
SY
QL_BIN_LOG::open failed to sync the index file."
);
call
mtr
.
add_suppression
(
"M
YS
QL_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
...
...
sql/log.cc
View file @
f640527e
...
@@ -3059,7 +3059,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
...
@@ -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
(
"M
SY
QL_BIN_LOG::open failed to generate new file name."
);
sql_print_error
(
"M
YS
QL_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,
...
@@ -3086,7 +3086,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
}
}
});
});
sql_print_error
(
"M
SY
QL_BIN_LOG::open failed to sync the index file."
);
sql_print_error
(
"M
YS
QL_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,
...
@@ -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
(
"M
SY
QL_BIN_LOG::purge_logs failed to flush register file."
);
sql_print_error
(
"M
YS
QL_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
(
"M
SY
QL_BIN_LOG::purge_logs failed to update the index file"
);
sql_print_error
(
"M
YS
QL_BIN_LOG::purge_logs failed to update the index file"
);
goto
err
;
goto
err
;
}
}
...
@@ -3866,7 +3866,7 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
...
@@ -3866,7 +3866,7 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
/* 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
(
"M
SY
QL_BIN_LOG::purge_logs failed to process registered files"
sql_print_error
(
"M
YS
QL_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,
...
@@ -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
(
"M
SY
QL_BIN_LOG::purge_index_entry failed to reinit register file "
sql_print_error
(
"M
YS
QL_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,
...
@@ -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
(
"M
SY
QL_BIN_LOG::purge_index_entry error %d reading from "
sql_print_error
(
"M
YS
QL_BIN_LOG::purge_index_entry error %d reading from "
"register file."
,
error
);
"register file."
,
error
);
goto
err
;
goto
err
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment