mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug mysql-test/mysql-test-run.pl: Auto merged sql/log.cc: Auto merged sql/log.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
This commit is contained in:
commit
387e56aa82
6 changed files with 116 additions and 87 deletions
24
sql/log.h
24
sql/log.h
|
|
@ -138,14 +138,10 @@ typedef struct st_log_info
|
|||
*/
|
||||
#define MAX_LOG_HANDLERS_NUM 3
|
||||
|
||||
enum enum_printer
|
||||
{
|
||||
NONE,
|
||||
LEGACY,
|
||||
CSV,
|
||||
LEGACY_AND_CSV
|
||||
};
|
||||
|
||||
/* log event handler flags */
|
||||
#define LOG_NONE 1
|
||||
#define LOG_FILE 2
|
||||
#define LOG_TABLE 4
|
||||
|
||||
class Log_event;
|
||||
class Rows_log_event;
|
||||
|
|
@ -500,12 +496,12 @@ public:
|
|||
bool reopen_log_table(uint log_type);
|
||||
|
||||
/* we use this function to setup all enabled log event handlers */
|
||||
int set_handlers(enum enum_printer error_log_printer,
|
||||
enum enum_printer slow_log_printer,
|
||||
enum enum_printer general_log_printer);
|
||||
void init_error_log(enum enum_printer error_log_printer);
|
||||
void init_slow_log(enum enum_printer slow_log_printer);
|
||||
void init_general_log(enum enum_printer general_log_printer);
|
||||
int set_handlers(uint error_log_printer,
|
||||
uint slow_log_printer,
|
||||
uint general_log_printer);
|
||||
void init_error_log(uint error_log_printer);
|
||||
void init_slow_log(uint slow_log_printer);
|
||||
void init_general_log(uint general_log_printer);
|
||||
};
|
||||
|
||||
#endif /* LOG_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue