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
f5668bc8
Commit
f5668bc8
authored
16 years ago
by
Kristofer Pettersson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected merge misstake.
parent
3f332cea
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
75 additions
and
36 deletions
+75
-36
sql/log.cc
sql/log.cc
+75
-36
No files found.
sql/log.cc
View file @
f5668bc8
...
...
@@ -3070,7 +3070,7 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
int
ret
=
0
;
bool
exit_loop
=
0
;
LOG_INFO
log_info
;
THD
*
thd
=
current_thd
;
THD
*
thd
=
current_thd
;
DBUG_ENTER
(
"purge_logs"
);
DBUG_PRINT
(
"info"
,(
"to_log= %s"
,
to_log
));
...
...
@@ -3097,9 +3097,12 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
It's not fatal if we can't stat a log file that does not exist;
If we could not stat, we won't delete.
*/
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_LOG_PURGE_NO_FILE
,
ER
(
ER_LOG_PURGE_NO_FILE
),
log_info
.
log_file_name
);
if
(
thd
)
{
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_LOG_PURGE_NO_FILE
,
ER
(
ER_LOG_PURGE_NO_FILE
),
log_info
.
log_file_name
);
}
sql_print_information
(
"Failed to execute my_stat on file '%s'"
,
log_info
.
log_file_name
);
my_errno
=
0
;
...
...
@@ -3109,13 +3112,24 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
/*
Other than ENOENT are fatal
*/
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_ERROR
,
ER_BINLOG_PURGE_FATAL_ERR
,
"a problem with getting info on being purged %s; "
"consider examining correspondence "
"of your binlog index file "
"to the actual binlog files"
,
log_info
.
log_file_name
);
if
(
thd
)
{
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_ERROR
,
ER_BINLOG_PURGE_FATAL_ERR
,
"a problem with getting info on being purged %s; "
"consider examining correspondence "
"of your binlog index file "
"to the actual binlog files"
,
log_info
.
log_file_name
);
}
else
{
sql_print_information
(
"Failed to delete log file '%s'; "
"consider examining correspondence "
"of your binlog index file "
"to the actual binlog files"
,
log_info
.
log_file_name
);
}
error
=
LOG_INFO_FATAL
;
goto
err
;
}
...
...
@@ -3132,9 +3146,12 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
{
if
(
my_errno
==
ENOENT
)
{
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_LOG_PURGE_NO_FILE
,
ER
(
ER_LOG_PURGE_NO_FILE
),
log_info
.
log_file_name
);
if
(
thd
)
{
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_LOG_PURGE_NO_FILE
,
ER
(
ER_LOG_PURGE_NO_FILE
),
log_info
.
log_file_name
);
}
sql_print_information
(
"Failed to delete file '%s'"
,
log_info
.
log_file_name
);
my_errno
=
0
;
...
...
@@ -3217,7 +3234,7 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
int
error
;
LOG_INFO
log_info
;
MY_STAT
stat_area
;
THD
*
thd
=
current_thd
;
DBUG_ENTER
(
"purge_logs_before_date"
);
pthread_mutex_lock
(
&
LOCK_index
);
...
...
@@ -3239,10 +3256,13 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
{
/*
It's not fatal if we can't stat a log file that does not exist.
*/
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_LOG_PURGE_NO_FILE
,
ER
(
ER_LOG_PURGE_NO_FILE
),
log_info
.
log_file_name
);
*/
if
(
thd
)
{
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_LOG_PURGE_NO_FILE
,
ER
(
ER_LOG_PURGE_NO_FILE
),
log_info
.
log_file_name
);
}
sql_print_information
(
"Failed to execute my_stat on file '%s'"
,
log_info
.
log_file_name
);
my_errno
=
0
;
...
...
@@ -3252,13 +3272,21 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
/*
Other than ENOENT are fatal
*/
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_ERROR
,
ER_BINLOG_PURGE_FATAL_ERR
,
"a problem with getting info on being purged %s; "
"consider examining correspondence "
"of your binlog index file "
"to the actual binlog files"
,
log_info
.
log_file_name
);
if
(
thd
)
{
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_ERROR
,
ER_BINLOG_PURGE_FATAL_ERR
,
"a problem with getting info on being purged %s; "
"consider examining correspondence "
"of your binlog index file "
"to the actual binlog files"
,
log_info
.
log_file_name
);
}
else
{
sql_print_information
(
"Failed to delete log file '%s'"
,
log_info
.
log_file_name
);
}
error
=
LOG_INFO_FATAL
;
goto
err
;
}
...
...
@@ -3272,22 +3300,33 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
if
(
my_errno
==
ENOENT
)
{
/* It's not fatal even if we can't delete a log file */
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_LOG_PURGE_NO_FILE
,
ER
(
ER_LOG_PURGE_NO_FILE
),
log_info
.
log_file_name
);
if
(
thd
)
{
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_LOG_PURGE_NO_FILE
,
ER
(
ER_LOG_PURGE_NO_FILE
),
log_info
.
log_file_name
);
}
sql_print_information
(
"Failed to delete file '%s'"
,
log_info
.
log_file_name
);
my_errno
=
0
;
}
else
{
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_ERROR
,
ER_BINLOG_PURGE_FATAL_ERR
,
"a problem with deleting %s; "
"consider examining correspondence "
"of your binlog index file "
"to the actual binlog files"
,
log_info
.
log_file_name
);
if
(
thd
)
{
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_ERROR
,
ER_BINLOG_PURGE_FATAL_ERR
,
"a problem with deleting %s; "
"consider examining correspondence "
"of your binlog index file "
"to the actual binlog files"
,
log_info
.
log_file_name
);
}
else
{
sql_print_information
(
"Failed to delete log file '%s'"
,
log_info
.
log_file_name
);
}
error
=
LOG_INFO_FATAL
;
goto
err
;
}
...
...
This diff is collapsed.
Click to expand it.
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