From: antony
Date: December 21 2005 10:04pm
Subject: bk commit into 5.1 tree (acurtis:1.1977)
List-Archive: http://lists.mysql.com/commits/341
Message-Id: <200512212205.jBLM59tX022116@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1977 05/12/21 14:03:57 acurtis@stripped +3 -0
  Fix for plugins work

  storage/example/ha_example.cc
    1.27 05/12/21 14:03:49 acurtis@stripped +3 -6
    remove old handlerton entries

  storage/example/Makefile.am
    1.2 05/12/21 14:03:49 acurtis@stripped +3 -0
    Build currently depends on sql/sql_yacc.h

  storage/csv/Makefile.am
    1.2 05/12/21 14:03:49 acurtis@stripped +3 -0
    Build currently depends on sql/sql_yacc.h

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	ltantony.(none)
# Root:	/home/antony/work3/mysql-5.1-plugable-2

--- 1.1/storage/csv/Makefile.am	2005-12-21 10:18:30 -08:00
+++ 1.2/storage/csv/Makefile.am	2005-12-21 14:03:49 -08:00
@@ -26,6 +26,9 @@
                         -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

--- 1.1/storage/example/Makefile.am	2005-12-21 10:18:30 -08:00
+++ 1.2/storage/example/Makefile.am	2005-12-21 14:03:49 -08:00
@@ -26,6 +26,9 @@
                         -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

--- 1.26/storage/example/ha_example.cc	2005-12-21 12:50:44 -08:00
+++ 1.27/storage/example/ha_example.cc	2005-12-21 14:03:49 -08:00
@@ -67,11 +67,11 @@
 #pragma implementation        // gcc: Class implementation
 #endif
 
-#include "../mysql_priv.h"
-#include <plugin.h>
-
+#include "mysql_priv.h"
 #include "ha_example.h"
 
+#include <plugin.h>
+
 static handler* example_create_handler(TABLE_SHARE *table);
 static int example_init_func();
 
@@ -100,12 +100,9 @@
   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
 };