From: Marc Alff
Date: May 12 2010 2:22pm
Subject: bzr commit into mysql-next-mr-wl5291 branch (marc.alff:3145)
List-Archive: http://lists.mysql.com/commits/108153
Message-Id: <20100512142227.8F3E15BC7EA@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_rzxHLJ+gXGSNHOMPW2CwrA)"

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

#At file:///Users/malff/BZR_TREE/mysql-next-mr-wl5291/ based on revid:marc.alff@stripped

 3145 Marc Alff	2010-05-12
      removed trailing whitespace

    modified:
      mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test
      mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test
      mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test
=== modified file 'mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test'
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test	2010-04-28 09:58:50 +0000
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test	2010-05-12 14:22:21 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.   
+# Copyright (c) 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

=== modified file 'mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test'
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test	2010-04-28 09:58:50 +0000
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test	2010-05-12 14:22:21 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.   
+# Copyright (c) 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

=== modified file 'mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test'
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test	2010-04-28 09:58:50 +0000
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test	2010-05-12 14:22:21 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.   
+# Copyright (c) 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


--Boundary_(ID_rzxHLJ+gXGSNHOMPW2CwrA)
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-wl5291/
# testament_sha1: d7bebb97e5a6460477e6e719288b57f40273a07f
# timestamp: 2010-05-12 08:22:27 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   nw4em72n3e1pn0vp
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUqb6H0AAqdfgEAQWWf//3oC
gAC////wUAUaeABqQAACGSEIPSA0GIAAGjR6TIAwAAAAGgAAAAASKaptJNijyjR5TQ0B6gAaDIAw
AAAAGgAAAAARUTTQCaA0aAmiaNNNTNQxRmSu2taDVav4wU4VCzsk1me+rnKEipMIJT79iy2g4kO7
APVgHwGlCxF2hBdMRxGo9S1D+dbE6eixRUhgKG8g8lAA+7BUg4Sx4TGVl5mQtZsXv5AhUsSyQdX/
3klXRqdXX8kI6hKwDLi0mrVPhZtdwkGk+Zy0PF5MatSBzQM6JMCJuDprm+1rDkwbNAVpG15tF7LG
GExGALFgNDMoExc4ozpPoQN5U8PaZWhgEbi8+Ej8PQyfZ1owaxJ1uocYCnvpMqGRxcWkTXCjrbdn
UdC13uAbArrEpaiPyzohjUFhgUECJYbsHfsdu5gg1t7sMRKqBKaBLRJlTcxMCsrmhIsiwSgfVgFT
tLMQ0Uut/JVJy4zbxkUzK2siGbceZ4k8d256W5GIGBCUcigSlDY2jFodxccdYSP03HQ/zW4t18+B
xaCTWQEz1nUaNBrqaCBSVlBQVlpmcMHiwNcWskVFRskYG60tKkvOBuuKBJljiVm18360TMbCsrNJ
glBoPVwNHgS2cdCHIyKHSceOQmk4O0139isqOQxN5bhiXFxm4yGbc10zLcBU2EkyYyDOpmskWkDA
8iwwgUTsSAcUleEhp8S30LIAfWBEVOgcLilLDFMk220Xai/ukRRBNxHOgMQkWJtp/MKVElSqAsTS
UsvhkVTUIN1ZAKi80mg8Tr6mRki40m4gamk0Ex1EOqBZQGqVTp0fn0QLhINjyO+s5HU7lJtNhx8+
5M4loeJmfATAJmq3Ycj/WkTwTP7sED2fAgPX4nRHaX3XHAk1cvlVGAJDugeHo+p1St2czgdjmUpS
kLhKSZ5OAnIOe8Rj4JiUnVl5lhI5FxVh1fINpXt0xcQkOhDnmXfoN/aw5nZoClgtmOHxyCDFzJuN
GsghCmQmySyw2Zbobzsc9pE2FaBA8iksMikIGYhrC5+z1ewVODv2Sd6Hn4y+zcJG8dDUh+Oh31FJ
zAh5Cc3R9ew7klidrWGnT/okzuFI5eJmjbM4fyOGHz50U7hMTeJ8ewlL5zbbxMnM8DU/t3jU9vEr
tSlCx0sECC/5kgWlARofp3vq8EDF/Hd/iB/RFIPg3hHnoN9ts7A+PM/Ynr97bD5vsxAxOwe2AVDT
fEoj2xGUFg0NGD9joJcpvEKhPShP0739IHwG52RdPDfYXGEymO3Eg355p7VBcXhyqgQgQh2Q93TG
VpCb+Pdxyk8sPd5lxD9s0CSEB3d6xD5eMRN7q/iLrg0X1a2Tc4l/cSe0NhYVQSDMYhAhDohI4yCA
VBzEgzS0TOeH9EQa1+rsuZVMR9cjf6VHZpGfRjjS6vuhvGz5OXkSJiXDe6CUZOpiTglETN/vPNC2
RdNrcPvkJM4NLx99OpmH0KwKBLsvVjvKI8erfHiJSU2l4aZ13/4u5IpwoSCVN9D6


--Boundary_(ID_rzxHLJ+gXGSNHOMPW2CwrA)--