From: magnus.blaudd
Date: June 16 2011 11:31am
Subject: bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3359) Bug#12664797
List-Archive: http://lists.mysql.com/commits/139318
X-Bug: 12664797
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4566842972041745933=="

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

#At file:///data0/magnus/mysql/5.5-cluster/ based on revid:magnus.blaudd@stripped

 3359 magnus.blaudd@stripped	2011-06-16
      Bug #12664797 PFS_UPGRADE.RESULT LINE NUMBER DIFF WHEN
      MYSQL_SYSTEM_TABLES.SQL MODIFIED
       - Update line numbers after adding more SQL to mysql_system_tables.sql

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade.result
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result	2010-11-08 16:55:38 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result	2011-06-16 11:30:28 +0000
@@ -25,7 +25,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -55,7 +55,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -83,7 +83,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -111,7 +111,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -139,7 +139,7 @@ ERROR 1050 (42S01) at line 428: Table 's
 ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 478: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1414: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   sae68zltaofuatoc
# target_branch: file:///data0/magnus/mysql/5.5-cluster/
# testament_sha1: 8d003bfb05778d4d7034491ebcb2c9a5d55584ea
# timestamp: 2011-06-16 13:31:07 +0200
# source_branch: file:///data0/magnus/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   tdwmlza04t2nmd7r
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcvGJGkAAdhfgAAQWGP/93fn
/qC////wUARNJpKsUNec22wSSImnqZPQpsgNJijEPRGTJ5MKYgAZIhiaZNCjxGoaAAAADQABIoaR
NNMjSTT1M0mNEZBkAaGg0aNDmATATIwAjExMJhMENMTTASUIU/U2lNtU9MKaabU00DQAADQBow44
JmOcfApxXOLKcT0dWEFxtHQWVoVSP3PRCTFGDJsO36Jd1LHb2Ilr60YRTytlkqzlIiVfb6ujLPuR
ydP67rkcUcEX/T+40SiZEl3uufO5yGDQjotyQ2P009o5hdiV0qHbSMD2EYpIyX/WI4V7QqehGHBe
u4V5xEwk9WN9I3YVEPdoRNo7UTVBJzcvzpFzwTNiZQqgbcLMNzXFZKCy24Rw1DdYI6TN54SLxWnL
FeEt5pB0q7s4YDWg7JzElTWkfEHCRegLSPfX6NxgYMsVjtz5Y7/J6Z8DcsxRuSFKkzFxhvTvizIG
MgU5V0wHRKQ8OdZ9F1RM0S1FpXjJqKkyMaCsE2jWgxoqWgOZWTzYZ1zzCmgmFIfA62YZDO+cBwyp
ZZaqUKDKhgsFoaLVuwFsAREgOjNMDQj52xBjFwCBeJn6TycdwaTFWvhZpnfD2RhgoHmIrkUUqDyv
mliULsCC5ga19UQXzDRgoQLzAX3yeahWp1qiII8TImUsb3DB1umRJOxwQFbH1G263j1zZr9/JMR1
ddbmmOO/bsZ2nl4+UOVHLpwo8qd0xzPXiiSgm9DBV6vZ1GIofbFDr29WIm9dsyHidNuH+1dTsBld
MljRGW852rNsYOHFyHndylTI7f8trr4O3HeSvII7Bt+5I7rHKmIr8sTgMBHB8ss9ERIWM70Yolch
4CfeLWI5/h/DVZ49+XfSlQxQWCHeD+ZtAYtbzKjzoOGE1Z0TwdouRS5kjnWkV50akVsKCONk+aei
8pVlyJ8izCOEYo1ZLBFCHk1+zWp0aNT35UYkSJF9Ne5ZzS/m+IqnuOq3PrqZ1FAXIqsRMh+jRrrZ
rZZ7m10uMFCGRfP4mKsEtSsjHdVdlUHEyIaVxsDhiLL95BVUPq/RTGshY1sitaNQpNc3WSpK8thp
MoZRQeiKTzTEn6+1NLpLU0qFnC4UJvG6mSIZg3GviXmqsjhfUE+qwKAoaDoCMsEhg3HWJkcgZxTv
wrKIoFWvc0DGlqG1dtWi2NJdxbFGqywlYKhxMnArkQIp2IkV3LwNSVUNQ1m9Aia4uXmYteAt8FUN
kkUPBIqFsAOp6i9EmQjazKyQ6ESImzZmyKhodJWY7JnL84Ei5MC+ZuhTOR0KGaJKLevMAGy6qUkD
axCHTY1aLezIjBGgh02g7V0ae/MO+0Jp2XbUNHMpexTlcORLTeFSpJdaJZkV1PtITuRCyyJJIKYM
ASsrIC4Cmx4jqlwJ9CKk5wilixB05ILbJAI2MN2edU1F4n2n+LuSKcKEhl4xI0g=


--===============4566842972041745933==--