From 86008e0ca2b864f1ab7a30e496d7c67c8fce06c2 Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Thu, 7 Apr 2011 17:21:22 +0200
Subject: [PATCH] Fix merge error.

---
 sql/log.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sql/log.cc b/sql/log.cc
index cf5237756ab..22f6b5a75a4 100644
--- 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 */
 }