diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
| commit | b7b25dc666a8d331d16231f9fb658af8c05ac694 (patch) | |
| tree | 0c7798c2d187db0da7837a70f306a789afc16521 /storage/heap | |
| parent | ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b (diff) | |
| parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
| download | mariadb-git-b7b25dc666a8d331d16231f9fb658af8c05ac694.tar.gz | |
Merge with 5.1-release.
- Fixed problem with oqgraph and 'make dist'
Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
This will be fixed when mwl#128 is merged into 5.3.
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/Makefile.am | 23 | ||||
| -rw-r--r-- | storage/heap/plug.in | 3 |
2 files changed, 18 insertions, 8 deletions
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am index ec1445dea67..d1b5c3b0cc9 100644 --- a/storage/heap/Makefile.am +++ b/storage/heap/Makefile.am @@ -27,8 +27,11 @@ LDADD = DEFS = @DEFS@ pkglib_LIBRARIES = libheap.a +noinst_LTLIBRARIES = libheap.la libheap_s.la \ + @plugin_heap_embedded_static_target@ +EXTRA_LTLIBRARIES = libheap_embedded.la + noinst_PROGRAMS = hp_test1 hp_test2 -noinst_LIBRARIES = libheap.a hp_test1_LDFLAGS = @NOINST_LDFLAGS@ hp_test1_LDADD = libheap.a \ $(top_builddir)/mysys/libmysys.a \ @@ -40,16 +43,24 @@ hp_test2_LDADD = libheap.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a noinst_HEADERS = heapdef.h ha_heap.h -libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ +libheap_la_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \ hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \ hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \ hp_rkey.c hp_block.c \ - ha_heap.cc \ hp_hash.c _check.c _rectest.c hp_static.c +libheap_s_la_SOURCES = ha_heap.cc +libheap_s_la_CFLAGS = $(AM_CFLAGS) +libheap_s_la_CXXFLAGS = $(AM_CXXFLAGS) +libheap_s_la_LIBADD = libheap.la +libheap_embedded_la_SOURCES = ha_heap.cc +libheap_embedded_la_LIBADD = libheap.la +libheap_embedded_la_CXXFLAGS = @plugin_embedded_defs@ -EXTRA_DIST = CMakeLists.txt plug.in +libheap_a_SOURCES= +libheap.a: libheap.la + $(CP) .libs/libheap.a $@ -# Don't update the files from bitkeeper -%::SCCS/s.% + +EXTRA_DIST = CMakeLists.txt plug.in diff --git a/storage/heap/plug.in b/storage/heap/plug.in index 50f31c60f2b..92ec01d3c88 100644 --- a/storage/heap/plug.in +++ b/storage/heap/plug.in @@ -1,7 +1,6 @@ MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine], [Volatile memory based tables]) MYSQL_PLUGIN_DIRECTORY(heap, [storage/heap]) -MYSQL_PLUGIN_STATIC(heap, [libheap.a]) +MYSQL_PLUGIN_STATIC(heap, [libheap_s.la], [libheap_embedded.la]) MYSQL_PLUGIN_MANDATORY(heap) dnl Memory tables -MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(heap, [ha_heap.cc]) |