← Back to branch summary

~thomir-deactivatedaccount/drizzle/drizzle-fix-bug653747

« back to all changes in this revision

Viewing changes to server/log.h

Merged from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/log.h
207
207
             const char *sql_text, uint sql_text_len);
208
208
  bool write(THD *thd, time_t current_time, time_t query_start_arg,
209
209
             const char *user_host, uint user_host_len,
210
 
             ulonglong query_utime, ulonglong lock_utime, bool is_command,
 
210
             uint64_t query_utime, uint64_t lock_utime, bool is_command,
211
211
             const char *sql_text, uint sql_text_len);
212
212
  bool open_slow_log(const char *log_name)
213
213
  {
234
234
  pthread_mutex_t LOCK_prep_xids;
235
235
  pthread_cond_t  COND_prep_xids;
236
236
  pthread_cond_t update_cond;
237
 
  ulonglong bytes_written;
 
237
  uint64_t bytes_written;
238
238
  IO_CACHE index_file;
239
239
  char index_file_name[FN_REFLEN];
240
240
  /*
263
263
  */
264
264
  bool no_auto_events;
265
265
 
266
 
  ulonglong m_table_map_version;
 
266
  uint64_t m_table_map_version;
267
267
 
268
268
  int write_to_file(IO_CACHE *cache);
269
269
  /*
306
306
    return table->s->table_map_version == table_map_version();
307
307
  }
308
308
 
309
 
  ulonglong table_map_version() const { return m_table_map_version; }
 
309
  uint64_t table_map_version() const { return m_table_map_version; }
310
310
  void update_table_map_version() { ++m_table_map_version; }
311
311
 
312
312
  int flush_and_set_pending_rows_event(THD *thd, Rows_log_event* event);
316
316
  {
317
317
    bytes_written = 0;
318
318
  }
319
 
  void harvest_bytes_written(ulonglong* counter)
 
319
  void harvest_bytes_written(uint64_t* counter)
320
320
  {
321
321
    (*counter)+=bytes_written;
322
322
    bytes_written=0;
364
364
  bool flush_and_sync();
365
365
  int purge_logs(const char *to_log, bool included,
366
366
                 bool need_mutex, bool need_update_threads,
367
 
                 ulonglong *decrease_log_space);
 
367
                 uint64_t *decrease_log_space);
368
368
  int purge_logs_before_date(time_t purge_time);
369
369
  int purge_first_log(Relay_log_info* rli, bool included);
370
370
  bool reset_logs(THD* thd);
398
398
 
399
399
  virtual bool log_slow(THD *thd, time_t current_time,
400
400
                        time_t query_start_arg, const char *user_host,
401
 
                        uint user_host_len, ulonglong query_utime,
402
 
                        ulonglong lock_utime, bool is_command,
 
401
                        uint user_host_len, uint64_t query_utime,
 
402
                        uint64_t lock_utime, bool is_command,
403
403
                        const char *sql_text, uint sql_text_len)= 0;
404
404
  virtual bool log_error(enum loglevel level, const char *format,
405
405
                         va_list args)= 0;
429
429
 
430
430
  virtual bool log_slow(THD *thd, time_t current_time,
431
431
                        time_t query_start_arg, const char *user_host,
432
 
                        uint user_host_len, ulonglong query_utime,
433
 
                        ulonglong lock_utime, bool is_command,
 
432
                        uint user_host_len, uint64_t query_utime,
 
433
                        uint64_t lock_utime, bool is_command,
434
434
                        const char *sql_text, uint sql_text_len);
435
435
  virtual bool log_error(enum loglevel level, const char *format,
436
436
                         va_list args);
485
485
  bool error_log_print(enum loglevel level, const char *format,
486
486
                      va_list args);
487
487
  bool slow_log_print(THD *thd, const char *query, uint query_length,
488
 
                      ulonglong current_utime);
 
488
                      uint64_t current_utime);
489
489
  bool general_log_print(THD *thd,enum enum_server_command command,
490
490
                         const char *format, va_list args);
491
491
  bool general_log_write(THD *thd, enum enum_server_command command,