summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/sql/log.cc b/sql/log.cc
index f6dcbea1210..eaa49bcb58c 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -162,7 +162,7 @@ void setup_log_handling()
/**
purge logs, master and slave sides both, related error code
- convertor.
+ converter.
Called from @c purge_error_message(), @c MYSQL_BIN_LOG::reset_logs()
@param res an internal to purging routines error code
@@ -381,7 +381,7 @@ public:
never zero.
This is done while calling the constructor binlog_cache_mngr.
- We cannot set informaton in the constructor binlog_cache_data
+ We cannot set information in the constructor binlog_cache_data
because the space for binlog_cache_mngr is allocated through
a placement new.
@@ -3031,7 +3031,7 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
mysql_mutex_lock(&LOCK_log);
if (is_open())
- { // Safety agains reopen
+ { // Safety against reopen
char buff[80], *end;
char query_time_buff[22+7], lock_time_buff[22+7];
size_t buff_len;
@@ -3330,7 +3330,7 @@ void MYSQL_BIN_LOG::cleanup()
/*
Free data for global binlog state.
- We can't do that automaticly as we need to do this before
+ We can't do that automatically as we need to do this before
safemalloc is shut down
*/
if (!is_relay_log)
@@ -4105,7 +4105,7 @@ err:
/**
- Delete all logs refered to in the index file.
+ Delete all logs referred to in the index file.
The new index file will only contain this file.
@@ -5685,7 +5685,7 @@ binlog_cache_mngr *THD::binlog_setup_trx_data()
- Start a statement transaction to allow us to truncate the cache.
- - Save the currrent binlog position so that we can roll back the
+ - Save the current binlog position so that we can roll back the
statement by truncating the cache.
We only update the saved position if the old one was undefined,
@@ -6870,7 +6870,7 @@ static const char* get_first_binlog(char* buf_arg)
}
if (normalize_binlog_name(buf_arg, fname, false))
{
- errmsg= "cound not normalize the first file name in the binlog index";
+ errmsg= "could not normalize the first file name in the binlog index";
goto end;
}
end:
@@ -9863,7 +9863,7 @@ TC_LOG_BINLOG::mark_xid_done(ulong binlog_id, bool write_checkpoint)
than compare all found against each other to find the one pointing to the
most recent binlog.
- Note also that we need to first release LOCK_xid_list, then aquire
+ Note also that we need to first release LOCK_xid_list, then acquire
LOCK_log, then re-aquire LOCK_xid_list. If we were to take LOCK_log while
holding LOCK_xid_list, we might deadlock with other threads that take the
locks in the opposite order.
@@ -9948,7 +9948,7 @@ TC_LOG_BINLOG::commit_checkpoint_notify(void *cookie)
necessary stuff.
In the future, this thread could also be used to do log rotation in the
- background, which could elimiate all stalls around binlog rotations.
+ background, which could eliminate all stalls around binlog rotations.
*/
pthread_handler_t
binlog_background_thread(void *arg __attribute__((unused)))