@@ -3058,7 +3058,8 @@ void MYSQL_QUERY_LOG::reopen_file()
30583058 TRUE - error occurred
30593059*/
30603060
3061- bool MYSQL_QUERY_LOG::write (time_t event_time, const char *user_host, size_t user_host_len, my_thread_id thread_id_arg,
3061+ bool MYSQL_QUERY_LOG::write (time_t event_time, const char *user_host,
3062+ size_t user_host_len, my_thread_id thread_id_arg,
30623063 const char *command_type, size_t command_type_len,
30633064 const char *sql_text, size_t sql_text_len)
30643065{
@@ -3159,7 +3160,8 @@ bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host, size_t use
31593160*/
31603161
31613162bool MYSQL_QUERY_LOG::write (THD *thd, time_t current_time,
3162- const char *user_host, size_t user_host_len, ulonglong query_utime,
3163+ const char *user_host, size_t user_host_len,
3164+ ulonglong query_utime,
31633165 ulonglong lock_utime, bool is_command,
31643166 const char *sql_text, size_t sql_text_len)
31653167{
@@ -3198,7 +3200,7 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
31983200 my_b_write (&log_file, (uchar*) user_host, user_host_len) ||
31993201 my_b_write (&log_file, (uchar*) " \n " , 1 ))
32003202 goto err;
3201-
3203+
32023204 /* For slow query log */
32033205 sprintf (query_time_buff, " %.6f" , ulonglong2double (query_utime)/1000000.0 );
32043206 sprintf (lock_time_buff, " %.6f" , ulonglong2double (lock_utime)/1000000.0 );
@@ -7537,7 +7539,8 @@ bool MYSQL_BIN_LOG::write_incident(THD *thd)
75377539}
75387540
75397541void
7540- MYSQL_BIN_LOG::write_binlog_checkpoint_event_already_locked (const char *name_arg, uint len)
7542+ MYSQL_BIN_LOG::
7543+ write_binlog_checkpoint_event_already_locked (const char *name_arg, uint len)
75417544{
75427545 my_off_t offset;
75437546 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,
1047110474#endif
1047210475
1047310476 if (! fdle->is_valid () ||
10474- (do_xa && my_hash_init (key_memory_binlog_recover_exec, &xids, &my_charset_bin, TC_LOG_PAGE_SIZE/3 , 0 ,
10477+ (do_xa && my_hash_init (key_memory_binlog_recover_exec, &xids,
10478+ &my_charset_bin, TC_LOG_PAGE_SIZE/3 , 0 ,
1047510479 sizeof (my_xid), 0 , 0 , MYF (0 ))))
1047610480 goto err1;
1047710481
0 commit comments