Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/my/mysql-5.1

configure.in

@@ -2465,7 +2465,8 @@ MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,storage/innobase,ha_innodb.o,[ dnl
 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,,

storage/csv/ha_tina.cc

@@ -1380,6 +1380,7 @@ bool ha_tina::check_if_incompatible_data(HA_CREATE_INFO *info,
   return COMPATIBLE_DATA_YES;
 }
 
+#ifdef MYSQL_PLUGIN
 mysql_declare_plugin
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
@@ -1392,4 +1393,4 @@ mysql_declare_plugin
   0x0100 /* 1.0 */,
 }
 mysql_declare_plugin_end;
-
+#endif

storage/example/Makefile.am

@@ -26,11 +26,10 @@ INCLUDES =              -I$(top_srcdir)/include \
                         -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
 EXTRA_DIST	      = cmakelists.txt
 LDADD =
 

storage/example/ha_example.cc

@@ -726,6 +726,7 @@ int ha_example::create(const char *name, TABLE *table_arg,
   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