From 597dc9a8e19e61f072bdb78653113e3102898e69 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Dec 2005 14:03:57 -0800 Subject: [PATCH] Fix for plugins work storage/csv/Makefile.am: Build currently depends on sql/sql_yacc.h storage/example/Makefile.am: Build currently depends on sql/sql_yacc.h storage/example/ha_example.cc: remove old handlerton entries --- storage/csv/Makefile.am | 3 +++ storage/example/Makefile.am | 3 +++ storage/example/ha_example.cc | 9 +++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am index 1d3c47bd650..df7749b599c 100644 --- a/storage/csv/Makefile.am +++ b/storage/csv/Makefile.am @@ -26,6 +26,9 @@ INCLUDES = -I$(top_srcdir)/include \ -I$(srcdir) WRAPLIBS= +$(top_builddir)/sql/sql_yacc.h: $(top_builddir)/sql/sql_yacc.yy + ( cd $(top_builddir)/sql && $(MAKE) sql_yacc.cc ) + pkglib_LTLIBRARIES = ha_csv.la ha_csv_la_LDFLAGS = -module diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am index d5896946c5b..ad97866d73a 100644 --- a/storage/example/Makefile.am +++ b/storage/example/Makefile.am @@ -26,6 +26,9 @@ INCLUDES = -I$(top_srcdir)/include \ -I$(srcdir) WRAPLIBS= +$(top_builddir)/sql/sql_yacc.h: $(top_builddir)/sql/sql_yacc.yy + ( cd $(top_builddir)/sql && $(MAKE) sql_yacc.cc ) + pkglib_LTLIBRARIES = ha_example.la ha_example_la_LDFLAGS = -module diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 79e13f3502d..0470f95e082 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -67,11 +67,11 @@ #pragma implementation // gcc: Class implementation #endif -#include "../mysql_priv.h" -#include - +#include "mysql_priv.h" #include "ha_example.h" +#include + static handler* example_create_handler(TABLE_SHARE *table); static int example_init_func(); @@ -100,12 +100,9 @@ handlerton example_hton= { example_create_handler, /* Create a new handler */ NULL, /* Drop a database */ NULL, /* Panic call */ - NULL, /* Release temporary latches */ - NULL, /* Update Statistics */ NULL, /* Start Consistent Snapshot */ NULL, /* Flush logs */ NULL, /* Show status */ - NULL, /* Replication Report Sent Binlog */ HTON_CAN_RECREATE };