Merge xiphis.org:/home/antony/work2/wl3201.3

into  xiphis.org:/home/antony/work2/wl3201.merge


BUILD/SETUP.sh:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
Makefile.am:
  Merge for WL#3201, some post-merge fixes will be required.
configure.in:
  Merge for WL#3201
plugin/Makefile.am:
  Merge for WL#3201
storage/innobase/Makefile.am:
  Merge for WL#3201

1 files changed, 15 insertions, 0 deletions

diff --git a/sql/log.cc b/sql/log.cc
index 818abe89e02..61d280f8504 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -30,6 +30,8 @@
 #include "message.h"
 #endif
 
+#include <mysql/plugin.h>
+
 /* max size of the log message */
 #define MAX_LOG_BUFFER_SIZE 1024
 #define MAX_USER_HOST_SIZE 512
@@ -4343,3 +4345,16 @@ err1:
   return 1;
 }
 
+
+mysql_declare_plugin(binlog)
+{
+  MYSQL_STORAGE_ENGINE_PLUGIN,
+  &binlog_hton,
+  binlog_hton.name,
+  "MySQL AB",
+  "Binlog Engine",
+  NULL, /* Plugin Init */
+  NULL, /* Plugin Deinit */
+  0x0100 /* 1.0 */,
+}
+mysql_declare_plugin_end;