From: Marc Alff
Date: May 3 2010 9:41am
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3163 to 3164)
 Bug#53255
List-Archive: http://lists.mysql.com/commits/107165
X-Bug: 53255
Message-Id: <20100503094155.1E05A4F2BE4@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_cijc4revuBRPhh4Az36EIw)"

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

 3164 Marc Alff	2010-05-03
      Bug#53255 Installed psi headers in wrong directory
      
      Before this fix, the files:
      - mysql_thread.h
      - mysql_file.h
      - psi.h
      were installed under the include/mysql directory,
      instead of include/mysql/psi, when using automake.
      
      With this fix, these files are installed under
      include/mysql/psi, as intended.
      
      Original fix by Kent Boortz

    modified:
      include/Makefile.am
 3163 Tor Didriksen	2010-04-30
      Bug#52385 mytap should not bail out on test failures
      Post push fix: some library dependencies not maintained by libtool on all platforms.

    modified:
      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:04:45 +0000
+++ b/include/Makefile.am	2010-05-03 09:41:25 +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 \
@@ -47,6 +47,9 @@ noinst_HEADERS =	config-win.h config-net
 			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
 			atomic/solaris.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_cijc4revuBRPhh4Az36EIw)
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-next-mr-bugfixing-\
#   53255/
# testament_sha1: 16db48bfd18e64121e060a878f7685c5ef68cbd4
# timestamp: 2010-05-03 03:41:55 -0600
# base_revision_id: tor.didriksen@stripped\
#   bcum1nvvzqx66bw0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYoryvQAAcXfgFAwXWf//35q
mIS////wUATZHXa9LumOzO1nt3q4SSJomENGhpNPTTUyNT1PJMamg9QxD0QCUQhhVP9Jg0TVHlBj
QI0A9QDQZAI0hpU81NQeajTRkR+qMTTIyND1GCNMhgkUCmp6p+SaZPUnoTyTeo0ZE0YjBMmQxqBJ
JGmpgJtKnpptKb0JlN6o0PSeoNAaAPSdKIheNddz/eIREe3+9SqiuugfGMMIw47117GGCUZBx9hm
vfC+6FiPnoGLV+xXy0kPyoJ1E0sZqoRk8qkYbTxyoqz8X7b/XXdgze3mz/T/Znc70idIc+gr/cUf
Sw6GTBZ3kVEsb3RSPUtDimRp54iUwwbPo43Zd3r1yRe+Nn5ROlrekbejun2rv2a8+mgt1DUKY6mE
aLKinKFFuayITya22EzasV6pKAWgxWJ4Hjg/iTun92plIrlwkmo5rdOnTaK+ZKML2TIyCKxhPSIh
xzN6cQyicQQ5iRMK6MCMjvPAXQJpWokNygmgo+NYm9w9tlGfHEWtH2SwVgc29Ha1Eay4rPa4azCv
VnwbK20jKLjtFiNZkUVkreWuDQcUGHNmJAnBiQAfC0VQ1H47NrmvmawUwnvkVY4KscLYxKyBzxja
UvURWuFbrOVlQwccMjEkZJmXQLpZnQ82HhXRiRJTyUojvNSuFzCSaCLecVPKOnrakS0mxLpJEqZX
V2CaMcRXHC8qbLATVSbNMQMDWbZYEc4TqScrB/Seg7VWwuTFpZwaYsd2M7fWK7kcMr5HEbOfnSrg
vPAR4WGZns+lvx6Ren8gUDlV7QjXqLC6JBg8XXLG6FBSDOZzX+d0398CpaBlhcYqSML5x9mKvBLx
yJyeOklvcLppkoUig56ndukO4xm03r3E90CLetM+oWP9MloNxWw4sOA47jSYeNY899El2lzASJOx
SLoFKzDoMq2HGboIsaC0gPT01QuBQiclcMOK1pKiw9s68HdJ17jUt/J6E5ZbTY7OXdm8+BHcZU1D
wmFLYWlhAxOseY0J/ixc+9OeVEn1H8siioP4ySj2wdvBltS7icaUSxoG16O03a61ZYQSzmwcUgUk
OrlMvA7NgSssnRVJEt26Inbtvic/AtKo54++44bxWbTUEQ55ix7HozElaGAfd00Dsl+At6gMPWuc
ctAJ5YV4Osakl0hLP2zEjevGSR4FgcCIHi/zPzhDRdsOgvFqOApQ7slgHlywXCFbhYUwz2UBpNE0
zswJQcGtGidAJVsYiaeI/PI+KbYpDKJ+rAaJo6ifw1zTcmPXUOYaiftdjB6emCMzrwxSbCdClsiD
nGZ0Ct6C/XUqDabQ1etx7WbsEje0APVN7mRz0QXNJgpCjySI1HGSJd2BjEq2bFQ8nDjxMrcaKBil
hmDuOpUZ/AUsdt96RgJ1MaLW9gWOKgCwtBExfoXMXkhCWadTzC42zMkziQOpoqyhXETKMbaXcUjs
nz2JSiJkBu4huLNAZYWJHTMA+8t5kapIlLUzUzhcDZ8UI9untgQiKgZmWu1K72IXltBpDHC4aHCa
qkb2EFRrCgsjXebEUfY/rnVAUjNjzlGBT/aozgRKwXiqDAtfF2zDmg6QWScM4JpZV4zYGM13qKt7
BhVa9EIjXFWcTOqW25HHIXckU4UJCKK8r0A=


--Boundary_(ID_cijc4revuBRPhh4Az36EIw)--