From: Marc Alff
Date: September 13 2010 11:20pm
Subject: bzr push into mysql-5.5-bugfixing branch (marc.alff:3206 to 3207) Bug#53102
List-Archive: http://lists.mysql.com/commits/118122
X-Bug: 53102
Message-Id: <20100913232006.84CBD45E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4575351613433647908=="

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

 3207 Marc Alff	2010-09-13
      Bug#53102 perfschema.pfs_upgrade fails when executed direct after mysql_upgrade
      
      Implemented post review comments.
      
      Added --force to the mysql_upgrade command in the test scripts,
      so that the test output does not depends on whether other tests involving an
      upgrade have been executed or not in the same test suite execution.

    modified:
      mysql-test/suite/perfschema/include/upgrade_check.inc
 3206 Tor Didriksen	2010-09-10
      Header files should be self-contained

    modified:
      storage/perfschema/ha_perfschema.cc
=== modified file 'mysql-test/suite/perfschema/include/upgrade_check.inc'
--- a/mysql-test/suite/perfschema/include/upgrade_check.inc	2010-07-20 19:15:29 +0000
+++ b/mysql-test/suite/perfschema/include/upgrade_check.inc	2010-09-13 23:19:39 +0000
@@ -18,7 +18,7 @@
 #
 
 --error 1
---exec $MYSQL_UPGRADE --skip-verbose > $out_file 2> $err_file
+--exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file
 
 # Verify that mysql_upgrade complained about the performance_schema
 --cat_file $err_file


--===============4575351613433647908==
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-5.5-bugfixing-\
#   53102/
# testament_sha1: 2442b7f867f8e03c64139812767305b1655398d2
# timestamp: 2010-09-13 17:20:06 -0600
# base_revision_id: tor.didriksen@stripped\
#   eamj03nas42bt2e3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR56rssAAZzfgAAQXGf/93am
eiC////wUAQW9oJbu5tZQGhlJkxJ6U0PUbU21PVPaU8p6gDI09QMJ6jQZIgaaGQyQagMTTQNBoA0
AInqZJkmmjTQAAA0AAANAOYBNMAmQwABMEwAAASRAgmAk9RkxJ6I2kaNJoAPU0PUZ2QzKT0e8YXL
LKHYLIDZqIySqUy7022Ct3bovmrREFG4+UfBB8LnkvejnuBl7OEQEiun1bGCWVIjMItgSqiGU3GU
oHaWSaVT644W5j9E7Iy4hxs3wXwF7G3C0/sQz/NWys6zCO+Arl6Pq2DMF1WkyXAjE8Jo35JrJ28Y
fMDjAdnAIHNkLKcYAxHAdfP7qkfu5UpxcS8lBRE0GshpiaiiJr0Xsz+FaWqYWFhBR4HvnybYQjfX
LTDbaKtfiT7bJWGhk0z5cHzFGZbj0zeydW2s6siCFb4qJB676Jcratyxk8As6WamCmX81jn4ERQq
ouAsKxhSLhUwkRXE6x2FtmoBZUmN7PzWifly8Ko8IOWEqCCW/NnxWKaWG1B1zSCriiENurlzDB+W
S4WSyDLENtMS1zsIipqqzVjg6ccYmeyx7yr7EkWMNzWtpmbOGsaGLpWPWCpqMKGFmWDS2FZfttUI
OXwnVfa1JNsMmuNQcGE8RNcHKkKhdjmRZAYt7ZrpGqjUq14hegWAAjyhh7q2L24M379n5jjjOdUB
SkjVSoXhNT+DAwDujrF4R4evN52kAUrZyulAs07ifOWNJixkG5FE2EUsK4IU2z9QxGty2d0l+X2F
/2fwCmHow6VkKyY+HpMrqzOa687FFxEuxIzM6UDgymxlG7l1Z3VKiauCny+3niGbKWL5LQEiYuR8
suoRl4KsQpFQEVpUSLoC3WDZUcF9QWu+eKnIqs11AVh2k6+QLOpZobeg0aLb0j5Y2yXImneoPlRW
JjQM8CiQ81DRI9K2N0yVxcwoRkcQp9hlK683PVaM8pLeQ5qBsOh/vGnPZxyInlrtxhiaFXi3qW+I
qkSsS8IMcA3Xsi6If1AZs1zcy4QfHTVc09PdA9aLgjKZivifvaByO7/2NMs3Q5Bmy6eWcB9dDbUn
c4ZhogQ254GSQx6QgGxwgRVBDG/u+vEDsznZV5ArdPU7huHHtT3FKQtNSElYmkezciFKhiawYgml
9VJTZmCUnXfMiKDAwbzfu7cMeXLUStsR9JkKl7CGC1HB19H8Sefo9u5+xmTm2E/duSlZKFKtnxF2
EMxdaiK65tzOmW1xHzSYNIyAgVui+7m5M9+9bq1lHSZEIvPvgWg27O12pV0V/UxdiDQsV2PmrCxl
WDW8IdDHSm5swjx1Tyh8iWjxI9Wd4tW/BgyulsffkW95VBYBcpM+9U6F9OXK/dCm9M5z7NiSOhmK
WPLsjkAWm0GgFwOAR5sK6Boy23sTO9bC+hTzF/4u5IpwoSA89V2W


--===============4575351613433647908==--