From: Joerg Bruehe
Date: March 10 2010 11:13am
Subject: bzr commit into mysql-next-mr-bugfixing branch (joerg:3123) Bug#49022
List-Archive: http://lists.mysql.com/commits/102861
X-Bug: 49022
Message-Id: <20100310111429.12B257AED6@trift2.fambruehe>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_90X5Sm10ScSHCMO1YOZMyg)"

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

#At file:///MySQL/REPO/Vnext/next-bugfix/ based on revid:mats@stripped

 3123 Joerg Bruehe	2010-03-10 [merge]
      Automerge part of the fixes for bug#49022 into "next-mr-bugfixing".

    modified:
      plugin/Makefile.am
=== modified file 'plugin/Makefile.am'
--- a/plugin/Makefile.am	2009-02-15 02:18:30 +0000
+++ b/plugin/Makefile.am	2010-03-10 09:48:43 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2006 MySQL AB
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 
 #
 # 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
@@ -24,5 +24,10 @@ EXTRA_DIST =	fulltext/configure.in	
 SUBDIRS =	@mysql_pg_dirs@
 DIST_SUBDIRS =	@mysql_pg_distdirs@
 
+# As of 5.5.3-m3, we want to include the plugin files of a debug build in the package
+install-exec-hook:
+	$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkglibdir)/plugin
+	test ! -d debug || $(TAR) cf - debug | ( cd $(DESTDIR)$(pkglibdir) && $(TAR) xvf - )
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: joerg@stripped
# target_branch: file:///MySQL/REPO/Vnext/next-bugfix/
# testament_sha1: 28dd8b3509194451f4df77739ca50dd99ba2bbd7
# timestamp: 2010-03-10 12:14:28 +0100
# source_branch: file:///MySQL/REPO/V55/bug33248-3-5.5/
# base_revision_id: mats@stripped
# 
# Begin bundle
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


--Boundary_(ID_90X5Sm10ScSHCMO1YOZMyg)--