From: Marc Alff
Date: September 13 2010 11:30pm
Subject: bzr push into mysql-trunk-bugfixing branch (marc.alff:3263 to 3264)
List-Archive: http://lists.mysql.com/commits/118124
Message-Id: <20100913233038.646D645E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8966618088207632845=="

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

 3264 Marc Alff	2010-09-13 [merge]
      Merge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

    modified:
      mysql-test/suite/perfschema/include/upgrade_check.inc
 3263 Tor Didriksen	2010-09-10 [merge]
      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


--===============8966618088207632845==
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-\
#   merge/
# testament_sha1: ec7a2a143772d775bf0829fa00a8cf75b5aba247
# timestamp: 2010-09-13 17:30:38 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: tor.didriksen@stripped\
#   rtbdd9jz303osl9c
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeJG+JsAAqTfgAAQXGf/93am
eiC////wUAWWZ7R0gtxm2pQAoSUmp6R6mUb0JiJ6aTYqfqntKPU9TTQxB6jTQSlPRNNNMjICnlQP
UBkGgBpo0yMGmk0IU8U09NR6gaeUaAGgPSDDKA5gE0wCZDAAEwTAAABJICDSZGmiYAjRMUfqm9UA
D1A9S3pz3Fq6pzPsba56uCN22UGibOUTC2u1o9eZhF2vV8sRP7V+vTwxyEEpLeBsYTPNDgsxC1LY
4uLrw+IkpcMXbpoDJ8/oV7zg7LguVnF6wLVMzkgoKPcLRuPL5FsmhJrUWQRcIhUXBdJFuYrUHsVQ
lOoItOpLlvNxqTVUVkfUqIJgajPIY/yOmTY3UaZ0k6hCLRTp/WuWE3Op0LqTA3kBzOCtkCgeQySM
/GuMAYjnFTRakiMTgsSOSVJIKECZyO1AyCmKAFWCqC5bLxwbUEUDZwwZXMmf1LBGImQtFB6huC+X
IbiEk68vUiY70tJbcNDjPahWo/BTnyKEJUMjSUdWe/OSfkgrl4RDNHHGOT7qoZ7ddYt+nIgkjNBV
xGjLqPQSyrlKphJoVGKioMEhzxuzFRxf6UnlwRCKCkbPNWBwQZ6DILZmwK0KyIZziFiexWVLhyLB
7INdieBO1DG9nNPyWsL2CPOl4/Na44vawKpI1TmdozjBrTxHjFMZQuvkEkyFPhCw4py1KKJTT1sB
eWXBN8Ndw4fExLMK2Ku1GV6kzQNxITwlntkTmrbbUn5d50IHClmMYYlMUKZOd3HIGb3yRjggYXsv
kPvN4YVFjHMGjX6NjUgWpFuLkBGtCgqBXXDO166WF4QJqm1hGCK5woXsHpcYEiqwrQbMPU3VDIYq
GipCnUMVC9ViaTTZd9GHtyO9Kre4SBK0RLtdMROpBIJJ0XX6W1Q13xTbt1YY44zp6ZhwDUulWY4j
dvDd7aDQLLK/mZ+K5N5/WXyoBLsbLhMOFLj4JLydXpVY95VJtIkl2gaXptTEM8M/Q6TEXRuzXBNg
2GA9cw8UH+p5JZyiRhEktLXPLYJniZh2ud5K6Q1HVbdUVAchEdwkZGROYcmUmOGUTNz05ZisJoYx
tmog23JdO2IZMsJ4vt0i5KBQWZj9avPJs/zDmWNuYDoizwiDfv66hW5AJuNF0wbOIP7KLmJyArSl
Mouwhiso7i9yxcnS0sI8JCYoYqYVWE7vw4ioiPc39jQxmzt4ueS2cBM5GrKodueSn71V94HPoRKk
w1tAM2+9OCM4HHbTPd349zLXpKW7dGZlYgJlyPXB+AQv1EF7m7ZoeaDwKj2Y9A+CnsgssAk6YWpa
yLHQXG9kXwD4eM1AxD0HqnR7sxpNYchOJnm9esxWonjCZfFfn9Ch3SsXr3lY4fsJGIf28ZpUrN5O
Gi/goJu9DUcPouW8ZFvXgK5wvEOQD0sAwHgPUCKqQhjh49zmAbi0laVe6SKavg8RuQMOdzOKHXE5
+UCgbCBJWgxFfPi4ZPnWMSDBk8TEfvUVIZmFGI4VpMmREQYTJbzbs4X4dOmoQrbAO5JPqF8oQwrU
t7hfXSn9Cenu6mwd4DMhyyfI560o2RfMqu+xBsH4oPAUEF1zbWcJgychHZJhaSEUA8rcBmuOg5SD
ruFtrRnhiS0JiMRhM6fi8oEgdtxKOaor9hX1MM12CTPsVzDTWHYViewVia3g/1MMZ7G0BDgal2B5
KHYkbVk8iR16TAXgN9WDG+Nw6hoC3qVPFeK4UW8B+59TIzlstkPtSGmsNZFIWKzLkx0KbEyE4ptk
zEms+SDQgmQaxs5QrmH3BqBwYl7BM6iuPZYVFR2Qf+LuSKcKEhxI3xNg


--===============8966618088207632845==--