Use one option --log-output[=option[,option...]]

instead of current --old-log-format and
--both-log-formats options


mysql-test/mysql-test-run.pl:
  use new option instead of the old one for testing
mysql-test/r/im_utils.result:
  correct result file
sql/log.cc:
  use log event handler flags instead of enum_printer
sql/log.h:
  Add log event handler flags to simplify log
  option processing

1 files changed, 10 insertions, 14 deletions

diff --git a/sql/log.h b/sql/log.h
index d709a73a391..d79e6bb48bd 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;
@@ -491,12 +487,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 */