From: Marc Alff
Date: July 16 2010 2:43pm
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3124) Bug#53255
List-Archive: http://lists.mysql.com/commits/113760
X-Bug: 53255
Message-Id: <20100716144307.3E33545E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3587545262466200062=="

--===============3587545262466200062==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-cleanup/ based on revid:marc.alff@stripped

 3124 Marc Alff	2010-07-16
      Bug#53255 Installed psi headers in wrong directory
      
      Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)

    modified:
      include/Makefile.am
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am	2010-07-15 11:13:30 +0000
+++ b/include/Makefile.am	2010-07-16 14:43:04 +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 lf.h my_bi
 			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
 			atomic/solaris.h mysql/innodb_priv.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 \


--===============3587545262466200062==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   cleanup/
# testament_sha1: ef93f9c6acb2e7ac5065d8c4e982eb5bbfa91d62
# timestamp: 2010-07-16 08:43:07 -0600
# base_revision_id: marc.alff@stripped\
#   174zxrl11k9i94k8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSDLN4YAAbDfgBAwXGf/935i
mAS////wUAPiyd3E5PW8M4GSIyRmgjRptJpkU9pqj1GJ6Jp6ZT0I9QSkjImyTBpPQp5IMhoaaAAA
AZKeRoUT9KeUyNqaA0aAAAAAEkVPKMCJ5TT1Mm1PUZGgGgAAHqBKSZFH4qfqepkntRonqNqekekG
gDQNAFrWMeXL/TbGhPb+vFb31m3TBlAegMCNSKBEVFYmc3/vt8S1+gP81GFwYJ0Vuhgz3qhgnU1M
0Kc5fOV9+p1vx7dEqv009GzdtsevXCjWqHZBZbm3SV2JY4qQjbp4bQMfvsiplkEhcAbseQRZlS/H
DiIsMc+mMkynZUPEKUqzxIhmjgtzFjMYsZy6OCuIFappVYaRwxBEmJEApz3C9Q1AcCNgNYwI9mEB
KpczD2UqQNDEHpQZbxlyXUVgHe5JRXtkqxKh6B8u+LpK5ixaA8kZ1pC/UuhGFblTvKXwiGJNKpMw
hOq8uVav7JczEhMXaqrGzBMGE4681RFSJbRRPEUDNQU0vY2ctgW/stREUmGAncW4yrqMYsAo1DeD
RALBatbKTQY4cwt5CbI43JEo22eDHMQve/XkBYMwlsoP1RcigjCwZBexW6hpmeEdUWAhgpRFEHc6
7DNUOkzI50xPIzlR9wCsoTC41OAUFWpbvnCdooKjOFtoiY6nSCqwF6zvaxppGIFqh3Uo6REQHinE
Sn66MiYzl/ptrBEXTKMkaFCu2Dn1Z1+YXNVF8qbZQ5ZD/JYhzrNSYP72eO7EkONYtvzUMAcPm0Yg
jDQo6VNyO/trWiFaDWRjlaJ7nvdDRrFUmTTdjrE0blCGk2bGlfPn2wOyEVqlAlUYYIg90ootVLJZ
wXOWgLRVJGjSxgjAyCi/WHDZl5+NLxMhJ5b40p8jp4bpqRgqSSQC7gF6ROIN0HKIS+eGdK+Ruqo3
ozqodxOJSh6TV1WLmUvY2wIBjYi9FZSazPnEgUAi2JMWIheQJ/qtO/DU27EJUwwRFYp4SELcLzNz
4nAWAVCRz5xDmISm5QEI4m2uEK0bcEVLkMJjeAWUEkCmAVdG7TaucKErCfhpY/ItS9m2LLpUVqWY
MOySXSK1aE1IQcIGuTQDCGTR8qREGex+KOEKYJhGUTXGdeZ4jPbWpMGMl2xTRiTXR0EPtygmJdpl
CieINqE4Rod2ewkNdwsjl8UYmUzqfFc++1gKIdGBX13iJAlUo4WFeQ3eBWZmYrGhmFou4OZFPlQD
EcTHFqrmAFQn1NYph194QT6sJHq1RE09KhlxqXeYzEH2VxV5WojApQP5C7kg1AqqX+qFKJPeBkCb
fTZhaqsB2lTwuVZKqjKvStZkFYp7DXSvM7gF0NDU8JFcWsRch5K0iG2a2Dh00cpyzzoyRmCodG7h
xzVXl6NCAQ3rBY5oHULIvG0mxP8XckU4UJAgyzeG


--===============3587545262466200062==--