From: Marc Alff
Date: May 3 2010 10:02am
Subject: bzr push into mysql-6.0-codebase-bugfixing branch (marc.alff:3856 to
 3857)
List-Archive: http://lists.mysql.com/commits/107169
Message-Id: <20100503100246.2F1364F856A@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_sLqUYf3zrfMXAZ1eqO/hNg)"

--Boundary_(ID_sLqUYf3zrfMXAZ1eqO/hNg)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 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 \


--Boundary_(ID_sLqUYf3zrfMXAZ1eqO/hNg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/marc.alff@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/marc.alff@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\
#   bugfixing/
# testament_sha1: 75302017296c4b2b87fb398a6a7f9376129c7a37
# timestamp: 2010-05-03 04:02:46 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/
# base_revision_id: tor.didriksen@stripped\
#   snbetlcd63sr7vsp
# 
# Begin bundle
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


--Boundary_(ID_sLqUYf3zrfMXAZ1eqO/hNg)--