1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Indentation cleanups (break long lines)

Browse Source
This commit is contained in:
Monty 2020-10-15 02:26:44 +03:00 committed by Sergei Golubchik
parent f671a9dee7
commit a28ea028af
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/log.cc
View File

@ -3058,7 +3058,8 @@ void MYSQL_QUERY_LOG::reopen_file()
TRUE - error occurred TRUE - error occurred
*/ */
bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host, size_t user_host_len, my_thread_id thread_id_arg, bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host,
size_t user_host_len, my_thread_id thread_id_arg,
const char *command_type, size_t command_type_len, const char *command_type, size_t command_type_len,
const char *sql_text, size_t sql_text_len) const char *sql_text, size_t sql_text_len)
{ {
@ -3159,7 +3160,8 @@ err:
*/ */
bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time, bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
const char *user_host, size_t user_host_len, ulonglong query_utime, const char *user_host, size_t user_host_len,
ulonglong query_utime,
ulonglong lock_utime, bool is_command, ulonglong lock_utime, bool is_command,
const char *sql_text, size_t sql_text_len) const char *sql_text, size_t sql_text_len)
{ {
@ -7537,7 +7539,8 @@ bool MYSQL_BIN_LOG::write_incident(THD *thd)
} }
void void
MYSQL_BIN_LOG::write_binlog_checkpoint_event_already_locked(const char *name_arg, uint len) MYSQL_BIN_LOG::
write_binlog_checkpoint_event_already_locked(const char *name_arg, uint len)
{ {
my_off_t offset; my_off_t offset;
Binlog_checkpoint_log_event ev(name_arg, len); Binlog_checkpoint_log_event ev(name_arg, len);
@ -10471,7 +10474,8 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name,
#endif #endif
if (! fdle->is_valid() || if (! fdle->is_valid() ||
(do_xa && my_hash_init(key_memory_binlog_recover_exec, &xids, &my_charset_bin, TC_LOG_PAGE_SIZE/3, 0, (do_xa && my_hash_init(key_memory_binlog_recover_exec, &xids,
&my_charset_bin, TC_LOG_PAGE_SIZE/3, 0,
sizeof(my_xid), 0, 0, MYF(0)))) sizeof(my_xid), 0, 0, MYF(0))))
goto err1; goto err1;

2
sql/mysqld.cc
View File

@ -5194,7 +5194,7 @@ static int init_server_components()
if (log_output_options & LOG_NONE) if (log_output_options & LOG_NONE)
{ {
/* /*
Issue a warining if there were specified additional options to the Issue a warning if there were specified additional options to the
log-output along with NONE. Probably this wasn't what user wanted. log-output along with NONE. Probably this wasn't what user wanted.
*/ */
if ((log_output_options & LOG_NONE) && (log_output_options & ~LOG_NONE)) if ((log_output_options & LOG_NONE) && (log_output_options & ~LOG_NONE))