bk commit into 5.1 tree (acurtis:1.2239) BUG#18464

[antony]

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.2239 06/03/28 14:34:28 acurtis@stripped +4 -0
  Bug#18464
    "Can't make example storage engine available"
  Build was attempting a shared-lib build instead of static

  storage/example/ha_example.cc
    1.34 06/03/28 14:34:22 acurtis@stripped +2 -1
    don't want plugin symbols in mysqld

  storage/example/Makefile.am
    1.5 06/03/28 14:34:22 acurtis@stripped +2 -3
    build as static library

  storage/csv/ha_tina.cc
    1.37 06/03/28 14:34:22 acurtis@stripped +2 -1
    don't want plugin symbols in mysqld

  configure.in
    1.354 06/03/28 14:34:22 acurtis@stripped +2 -1
    configure example to be linked in

# 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:	localhost.(none)
# Root:	/home/antony/work2/p1-bug18464

--- 1.353/configure.in	2006-03-25 08:03:03 -08:00
+++ 1.354/configure.in	2006-03-28 14:34:22 -08:00
@@ -2465,7 +2465,8 @@ MYSQL_STORAGE_ENGINE(innobase,,innodb,,,
 MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[
   MYSQL_SETUP_BERKELEY_DB
 ])
-MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[
+MYSQL_STORAGE_ENGINE(example,,,,,,storage/example,no,
+ \$(top_builddir)/storage/example/libexample.a,[
   AC_CONFIG_FILES(storage/example/Makefile)
 ])
 MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,,

--- 1.4/storage/example/Makefile.am	2006-01-05 05:16:22 -08:00
+++ 1.5/storage/example/Makefile.am	2006-03-28 14:34:22 -08:00
@@ -26,11 +26,10 @@ INCLUDES =              -I$(top_srcdir)/
                         -I$(srcdir)
 WRAPLIBS=
 
-pkglib_LTLIBRARIES =	ha_example.la
+pkglib_LIBRARIES =	libexample.a
 
-ha_example_la_LDFLAGS =	-module
 noinst_HEADERS	      =	ha_example.h
-ha_example_la_SOURCES =	ha_example.cc
+libexample_a_SOURCES =	ha_example.cc
 
 LDADD =
 

--- 1.36/storage/csv/ha_tina.cc	2006-03-06 10:03:09 -08:00
+++ 1.37/storage/csv/ha_tina.cc	2006-03-28 14:34:22 -08:00
@@ -1037,6 +1037,7 @@ bool ha_tina::check_if_incompatible_data
   return COMPATIBLE_DATA_YES;
 }
 
+#ifdef MYSQL_PLUGIN
 mysql_declare_plugin
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
@@ -1049,4 +1050,4 @@ mysql_declare_plugin
   0x0100 /* 1.0 */,
 }
 mysql_declare_plugin_end;
-
+#endif

--- 1.33/storage/example/ha_example.cc	2006-02-14 01:51:20 -08:00
+++ 1.34/storage/example/ha_example.cc	2006-03-28 14:34:22 -08:00
@@ -726,6 +726,7 @@ int ha_example::create(const char *name,
   DBUG_RETURN(0);
 }
 
+#ifdef MYSQL_PLUGIN
 mysql_declare_plugin
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
@@ -738,4 +739,4 @@ mysql_declare_plugin
   0x0001 /* 0.1 */,
 }
 mysql_declare_plugin_end;
-
+#endif