List:Commits« Previous MessageNext Message »
From:Marc Alff Date:May 3 2010 10:02am
Subject:bzr push into mysql-6.0-codebase-bugfixing branch (marc.alff:3856 to
3857)
View as plain text  
 3857 Marc Alff	2010-05-03 [merge]
      Merge mysql-mext-mr --> mysql-6.0-codebase-bugfixing

    modified:
      include/Makefile.am
 3856 Tor Didriksen	2010-05-01 [merge]
      merge from next-mr-bugfixing:
      Bug#52385 mytap should not bail out on test failures
      Post push fix: some library dependencies not maintained by libtool on all platforms.

    modified:
      storage/ndb/src/common/util/Makefile.am
      unittest/examples/Makefile.am
      unittest/mysys/Makefile.am
      unittest/mytap/t/Makefile.am
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am	2010-04-13 15:31:32 +0000
+++ b/include/Makefile.am	2010-05-03 10:01:58 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2000-2006 MySQL AB, 2009 Sun Microsystems, Inc
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -15,6 +15,8 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
+pkgpsiincludedir =      $(pkgincludedir)/psi
+
 BUILT_SOURCES =		$(HEADERS_GEN_MAKE) link_sources probes_mysql_nodtrace.h
 HEADERS_GEN_CONFIGURE =		mysql_version.h
 HEADERS_GEN_MAKE =		my_config.h
@@ -25,8 +27,6 @@ pkginclude_HEADERS =	$(HEADERS_ABI) my_d
 			my_xml.h mysql_embed.h mysql/services.h \
 			mysql/service_my_snprintf.h mysql/service_thd_alloc.h \
 		  	my_pthread.h my_no_pthread.h \
-			mysql/psi/psi.h mysql/psi/mysql_thread.h \
-			mysql/psi/mysql_file.h \
 			decimal.h errmsg.h my_global.h my_net.h \
 			my_getopt.h sslopt-longopts.h my_dir.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
@@ -46,6 +46,10 @@ noinst_HEADERS =	config-win.h config-net
 			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
 			atomic/solaris.h \
 			wqueue.h waiting_threads.h
+
+pkgpsiinclude_HEADERS = mysql/psi/psi.h mysql/psi/mysql_thread.h \
+			mysql/psi/mysql_file.h
+
 EXTRA_DIST =        mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base \
 			CMakeLists.txt \
 			mysql/psi/psi_abi_v1.h.pp \


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100503100158-cr0y3c4rparypvuo.bundle
Thread
bzr push into mysql-6.0-codebase-bugfixing branch (marc.alff:3856 to3857)Marc Alff3 May