diff options
| author | unknown <acurtis@xiphis.org> | 2006-03-29 17:31:59 -0800 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-03-29 17:31:59 -0800 |
| commit | 55e0e30c4939ebec35fdb4ca9cde086e2ac478c0 (patch) | |
| tree | 1bcf6849d0332bce7511cc1213eed012fcf5dcb7 /storage/example | |
| parent | fa24633f6b153bbaeb8841baac88f77b2519b1f8 (diff) | |
| parent | fded4bdf77cc445c2f9447ee924dfb2cda5cffad (diff) | |
| download | mariadb-git-55e0e30c4939ebec35fdb4ca9cde086e2ac478c0.tar.gz | |
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into xiphis.org:/home/antony/work2/p1-bug18464
configure.in:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/example/Makefile.am:
Auto merged
Diffstat (limited to 'storage/example')
| -rw-r--r-- | storage/example/Makefile.am | 5 | ||||
| -rw-r--r-- | storage/example/ha_example.cc | 3 |
2 files changed, 4 insertions, 4 deletions
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 |