summaryrefslogtreecommitdiff
path: root/sql/log.h
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2006-02-12 20:45:03 +0100
committerunknown <kent@mysql.com>2006-02-12 20:45:03 +0100
commit4ffb392628e07b80f3f5ba0940cf7ed542053587 (patch)
treecf82c3578299f7628234c016f832938afdc6db27 /sql/log.h
parent0dbf883aee05d9ce4a42d5a1be723fb5bdd5002f (diff)
parent0d4cae389d37017123950a930516a442e27f529e (diff)
downloadmariadb-git-4ffb392628e07b80f3f5ba0940cf7ed542053587.tar.gz
Merge
include/config-netware.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged netware/BUILD/compile-AUTOTOOLS: Auto merged netware/Makefile.am: Auto merged netware/my_manage.h: Auto merged netware/mysql_test_run.c: Auto merged netware/BUILD/compile-linux-tools: Auto merged netware/BUILD/compile-netware-END: Auto merged netware/BUILD/mwenv: Auto merged netware/BUILD/nwbootstrap: Auto merged server-tools/instance-manager/Makefile.am: Auto merged sql/log.cc: Auto merged sql/log.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged storage/innobase/include/univ.i: Auto merged storage/innobase/os/os0thread.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/ndb/src/kernel/blocks/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/dbtup/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h24
1 files changed, 10 insertions, 14 deletions
diff --git a/sql/log.h b/sql/log.h
index 7f90737c096..98a86072fca 100644
--- a/sql/log.h
+++ b/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;
@@ -503,12 +499,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 */