diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-29 16:50:58 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-29 16:50:58 -0400 |
| commit | 8a1efa1bdd29b756c93a3ddbd8ad6fadec1082bc (patch) | |
| tree | 9827e75d29817f3ddbc2008ba2b5b21553c14c5e /sql/log.cc | |
| parent | 7c42b47e67918104fddd121a1ca9fede28ed47cf (diff) | |
| parent | 9eba34f08675c31b0796eeb127582be827773070 (diff) | |
| download | mariadb-git-8a1efa1bdd29b756c93a3ddbd8ad6fadec1082bc.tar.gz | |
Merge branch '10.0' into 10.0-galera
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/log.cc b/sql/log.cc index 745b7747aab..83ddca7aa16 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -694,7 +694,7 @@ void Log_to_csv_event_handler::cleanup() indicated in the return value. @retval FALSE OK - @retval TRUE error occured + @retval TRUE error occurred */ bool Log_to_csv_event_handler:: @@ -859,7 +859,7 @@ err: RETURN FALSE - OK - TRUE - error occured + TRUE - error occurred */ bool Log_to_csv_event_handler:: @@ -1164,7 +1164,7 @@ void Log_to_file_event_handler::flush() RETURN FALSE - OK - TRUE - error occured + TRUE - error occurred */ bool LOGGER::error_log_print(enum loglevel level, const char *format, @@ -1322,7 +1322,7 @@ bool LOGGER::flush_general_log() RETURN FALSE OK - TRUE error occured + TRUE error occurred */ bool LOGGER::slow_log_print(THD *thd, const char *query, uint query_length, @@ -2885,7 +2885,7 @@ void MYSQL_QUERY_LOG::reopen_file() RETURN FASE - OK - TRUE - error occured + TRUE - error occurred */ bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host, @@ -2987,7 +2987,7 @@ err: RETURN FALSE - OK - TRUE - error occured + TRUE - error occurred */ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time, @@ -6291,7 +6291,7 @@ binlog_checkpoint_callback(void *cookie) /* For every supporting engine, we increment the xid_count and issue a commit_checkpoint_request(). Then we can count when all - commit_checkpoint_notify() callbacks have occured, and then log a new + commit_checkpoint_notify() callbacks have occurred, and then log a new binlog checkpoint event. */ mysql_bin_log.mark_xids_active(entry->binlog_id, 1); |