diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-11-02 14:10:04 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-11-02 14:10:04 +0300 |
commit | a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0 (patch) | |
tree | 52d813ba1e4f0b538b1f175a1d157d865cce8a22 /storage | |
parent | 487bfd56d4386fe9abbd4beb80d759b0c5c95909 (diff) | |
parent | 46aa4c2672e2d0b1727dde5b80bd5039adbf96f6 (diff) | |
download | mariadb-git-a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0.tar.gz |
Manual merge from mysql-next-mr.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/archive/Makefile.am | 15 | ||||
-rw-r--r-- | storage/innobase/CMakeLists.txt | 12 |
2 files changed, 20 insertions, 7 deletions
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am index 319ed467966..143d684025e 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2005-2006 MySQL AB +# Copyright (C) 2009 SUN Microsystems # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -68,14 +69,23 @@ archive_reader_LDFLAGS = @NOINST_LDFLAGS@ EXTRA_DIST = CMakeLists.txt plug.in if HAVE_DTRACE_DASH_G +# The object for static and dynamic linking of archive differ +# For static linkage of archive to mysqld libarchive_a_LIBADD = probes_mysql.o libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers -CLEANFILES = probes_mysql.o dtrace_files dtrace_providers +# For archive as shared library +ha_archive_la_LIBADD = probes_sh_mysql.o +ha_archive_la_DEPENDENCIES = probes_sh_mysql.o dtrace_shared_files dtrace_providers + +CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers dtrace_shared_files DTRACEFILES = libarchive_a-ha_archive.o +DTRACESHAREDFILES = .libs/ha_archive_la-ha_archive.o DTRACEPROVIDER = probes_mysql.d dtrace_files: echo $(DTRACEFILES) > $@ +dtrace_shared_files: + echo $(DTRACESHAREDFILES) > $@ dtrace_providers: probes_mysql.d echo $(DTRACEPROVIDER) > $@ probes_mysql.d: @@ -83,6 +93,9 @@ probes_mysql.d: $(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d echo timestamp > dtrace_sources +probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDFILES) + $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@ + probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ endif diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index 57ad7f4b28c..d67b518642c 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -86,12 +86,12 @@ SET(INNOBASE_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION) IF (MYSQL_VERSION_ID GREATER "50137") - IF (WITH_INNOBASE_STORAGE_ENGINE) - MYSQL_STORAGE_ENGINE(INNOBASE) - ELSE (WITH_INNOBASE_STORAGE_ENGINE) - SET (INNODB_SOURCES ${INNOBASE_SOURCES}) - MYSQL_STORAGE_ENGINE(INNODB) - ENDIF (WITH_INNOBASE_STORAGE_ENGINE) + MYSQL_STORAGE_ENGINE(INNOBASE) + # Use ha_innodb for plugin name, if plugin is built + GET_TARGET_PROPERTY(LIB_LOCATION ha_innobase LOCATION) + IF(LIB_LOCATION) + SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb) + ENDIF(LIB_LOCATION) ELSE (MYSQL_VERSION_ID GREATER "50137") IF (NOT SOURCE_SUBLIBS) ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER) |