diff options
| author | monty@mysql.com <> | 2006-03-30 06:11:34 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-03-30 06:11:34 +0300 |
| commit | 2b1f521286e6a8bf9bed3a40b42d9868db45b147 (patch) | |
| tree | 6d65282cfada4e881157910ab4e1a02a2b31818b | |
| parent | 98052743ff78b7547ba4f4747300e6100ee8af53 (diff) | |
| parent | 6cbd57914adf78c9821e5f201b06a4b5ca6262aa (diff) | |
| download | mariadb-git-2b1f521286e6a8bf9bed3a40b42d9868db45b147.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | storage/csv/ha_tina.cc | 3 | ||||
| -rw-r--r-- | storage/example/Makefile.am | 5 | ||||
| -rw-r--r-- | storage/example/ha_example.cc | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 3dfbe913727..0253a3a6771 100644 --- a/configure.in +++ b/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,, diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 0005bc9bf9c..38575d26242 100644 --- a/storage/csv/ha_tina.cc +++ b/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 diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am index 68db89ee220..518d82abe2d 100644 --- a/storage/example/Makefile.am +++ b/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 = diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index dff36e10b1a..433fc3e78e0 100644 --- a/storage/example/ha_example.cc +++ b/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 |