diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-04-07 17:21:22 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-04-07 17:21:22 +0200 |
| commit | 86008e0ca2b864f1ab7a30e496d7c67c8fce06c2 (patch) | |
| tree | d75782df95036cd2ae9b1a1c78a64049888fd6e6 /sql/log.cc | |
| parent | 7f650d4be5b0de743c57d01f79a99b81aa0ce349 (diff) | |
| download | mariadb-git-86008e0ca2b864f1ab7a30e496d7c67c8fce06c2.tar.gz | |
Fix merge error.
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 0 insertions, 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 */ } |