Fix merge error.

86008e0c · unknown · 7f650d4b · 86008e0c
Commit 86008e0c authored Apr 07, 2011 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

sql/log.cc sql/log.cc +0 -4

No files found.
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -6936,11 +6936,7 @@ maria_declare_plugin(binlog)
  NULL, /* Plugin Deinit */
  0x0100 /* 1.0 */,
  binlog_status_vars_top,     /* status variables                */
-#ifndef DBUG_OFF
  binlog_sys_vars,            /* system variables                */
-#else
-  NULL,                       /* system variables                */
-#endif
  "1.0",                      /* string version */
  MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
 }