1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge error.

Browse Source
This commit is contained in:
unknown 2011-04-07 17:21:22 +02:00
parent 7f650d4be5
commit 86008e0ca2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/log.cc
View File

@ -6936,11 +6936,7 @@ maria_declare_plugin(binlog)
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
binlog_status_vars_top, /* status variables */ binlog_status_vars_top, /* status variables */
#ifndef DBUG_OFF
binlog_sys_vars, /* system variables */ binlog_sys_vars, /* system variables */
#else
NULL, /* system variables */
#endif
"1.0", /* string version */ "1.0", /* string version */
MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
} }