diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
| commit | a3d80d952d7b99680ca4a3a89e128ecc0d490c10 (patch) | |
| tree | 0d72ee69e037cdd09618ddb53652dd1b220890dc /storage/example | |
| parent | ec06ba24553d2d83b3a6a6bc4d8150910b01ee7c (diff) | |
| parent | 966661c8cc75dd7d540a5fe40b4d893c40e91d26 (diff) | |
| download | mariadb-git-a3d80d952d7b99680ca4a3a89e128ecc0d490c10.tar.gz | |
merge with 5.1
Diffstat (limited to 'storage/example')
| -rw-r--r-- | storage/example/Makefile.am | 7 | ||||
| -rw-r--r-- | storage/example/ha_example.cc | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am index 10163e307b1..dc499e2f9dd 100644 --- a/storage/example/Makefile.am +++ b/storage/example/Makefile.am @@ -35,15 +35,12 @@ noinst_HEADERS = ha_example.h EXTRA_LTLIBRARIES = ha_example.la pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -ha_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_example_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_example_la_SOURCES = ha_example.cc - EXTRA_LIBRARIES = libexample.a noinst_LIBRARIES = @plugin_example_static_target@ -libexample_a_CXXFLAGS = $(AM_CFLAGS) -libexample_a_CFLAGS = $(AM_CFLAGS) +libexample_a_CXXFLAGS = $(AM_CXXFLAGS) libexample_a_SOURCES= ha_example.cc diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index e8ef0b72bc8..f2aee1de70c 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -225,7 +225,7 @@ static int example_done_func(void *p) hash_free(&example_open_tables); pthread_mutex_destroy(&example_mutex); - DBUG_RETURN(0); + DBUG_RETURN(error); } |