diff options
author | Mats Kindahl <mats.kindahl@oracle.com> | 2011-08-15 20:12:11 +0200 |
---|---|---|
committer | Mats Kindahl <mats.kindahl@oracle.com> | 2011-08-15 20:12:11 +0200 |
commit | ee789c28b4cf1ac42f975730b567016d3965ea81 (patch) | |
tree | a54b38fc92199ba1d0a8467adb980856f5effafe /sql/log.cc | |
parent | dca971de92e1faa4ea5ff6efc79923de60a6ab86 (diff) | |
download | mariadb-git-ee789c28b4cf1ac42f975730b567016d3965ea81.tar.gz |
Merging into mysql-5.5.16-release.
Diffstat (limited to 'sql/log.cc')
-rw-r--r-- | sql/log.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 9080dcd7fa2..c6b41447d6a 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -6604,6 +6604,7 @@ mysql_declare_plugin(binlog) 0x0100 /* 1.0 */, NULL, /* status variables */ NULL, /* system variables */ - NULL /* config options */ + NULL, /* config options */ + 0, /* flags */ } mysql_declare_plugin_end; |