mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-01 12:45:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

after merge fixes

Browse source 
mysql-test/r/partition_error.result:
  result fix
sql/log.cc:
  use open_slow_log() instead of open_query_log() for slow query log
sql/log.h:
  after merge fix
sql/set_var.cc:
  after merge fix
  use open_slow_log() instead of open_query_log() for slow query log
This commit is contained in:
unknown 2006-06-21 14:53:40 +05:00
commit f4e2516a1a
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/log.h
View file

@ -467,8 +467,8 @@ public:
CHARSET_INFO *client_cs);
void flush();
void init_pthread_objects();
MYSQL_LOG *get_mysql_slow_log() { return &mysql_slow_log; }
MYSQL_LOG *get_mysql_log() { return &mysql_log; }
MYSQL_QUERY_LOG *get_mysql_slow_log() { return &mysql_slow_log; }
MYSQL_QUERY_LOG *get_mysql_log() { return &mysql_log; }
};
@ -543,13 +543,13 @@ public:
void init_general_log(uint general_log_printer);
void deactivate_log_handler(THD* thd, uint log_type);
bool activate_log_handler(THD* thd, uint log_type);
MYSQL_LOG *get_slow_log_file_handler()
MYSQL_QUERY_LOG *get_slow_log_file_handler()
{
if (file_log_handler)
return file_log_handler->get_mysql_slow_log();
return NULL;
}
MYSQL_LOG *get_log_file_handler()
MYSQL_QUERY_LOG *get_log_file_handler()
{
if (file_log_handler)
return file_log_handler->get_mysql_log();