From: Nirbhay Choubey
Date: April 8 2011 7:04am
Subject: bzr commit into mysql-5.5 branch (nirbhay.choubey:3427) Bug#11765157
List-Archive: http://lists.mysql.com/commits/135018
X-Bug: 11765157
Message-Id: <201104080705.p38759YK008639@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1634709645=="

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

#At file:///home/nirbhay/Project/mysql/repo/bugs/mysql-5.5/ based on revid:nirbhay.choubey@stripped

 3427 Nirbhay Choubey	2011-04-08
      Adjusting test result for bug#11765157.

    modified:
      mysql-test/r/mysqlslap.result
=== modified file 'mysql-test/r/mysqlslap.result'
--- a/mysql-test/r/mysqlslap.result	2011-04-08 06:52:44 +0000
+++ b/mysql-test/r/mysqlslap.result	2011-04-08 07:04:54 +0000
@@ -235,6 +235,7 @@ Database
 information_schema
 mtr
 mysql
+performance_schema
 test
 # 'bug58090' database should be present.
 SHOW DATABASES;
@@ -243,5 +244,6 @@ information_schema
 bug58090
 mtr
 mysql
+performance_schema
 test
 DROP DATABASE bug58090;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: nirbhay.choubey@stripped\
#   fu5wajpzolg7jghe
# target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.5/
# testament_sha1: 27735278856f089c574ce68c1699dbbc25240eb9
# timestamp: 2011-04-08 12:34:57 +0530
# source_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.1.58090/
# base_revision_id: nirbhay.choubey@stripped\
#   alj24238mounp8lt
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQlHXOsAAWvfgEAQWGP/93oB
AAC////wUAN+6tjrtyjhc0JJKeiNPJU/TVP0yJ6ZPSaamSeoBo0YNFPST0yaNRtTQ0aaaAAAACSI
RpqbVPKMhppoPUNNGmgABgABoAAyaAAANAJJTJimEw1MSeqZhJpk0NNPKNPUVGOhxPbLyN0MSd+d
qCdEXbJPHSNGw+d7DMe3qHV8BrszjNz3x/T4z3ekd2FjSY3sXkMa039ydkT6MJnsI/Wa3itNIWGH
vOcpYUZ0pGKR0WFr3kR6W9qA8zgU0OIsjmNTQEVFMgWg7lpAUxG13RamseiV8+oRcWYaxEDR8z4X
V0G3NfUuoqUCmyi/p5N83kYSH0F+lvoC8zJy3rosHatp0N1k8QwKzGzMpTjO0gzMq13l6nhQwoaX
vEUVmDXVqRvqdgztgojiy51rVljYxbMhntJLaWF5BLUxHKKiPbcG567XauHfAVDpTmE8EoRQFNj3
koqhXiad1IxEYKElLcr43DQuIl0lOpN/kLsa38WlG4Q+vI0zdNEr8vGqzgmVslDE5RoX5trRwyed
zjTzQx4mlNyUUSimsawtCVjeBn05XNrwFXz3VEQsXKYMz8ORTXIQP5wQIGhAHzim3Ig/MzXpDpT0
vDIXX6KuusnktKUPXXeC61HbcZFvTN8Z+4KoF+B3cwx55I5biJCrtLIhYcirg7Gk8JFupkiIiFFu
yC3iZjSWLhTIooBg2skMXpzsHmVtVgtMGATdJYz6nQ0zqmxHbdYczfF1a33P6QbDjE4Nt/TjYZnu
mVNkbzLm7jwmG2AOWYLVXvGydGTrOWGBSfy/Sa91YxT2Ez7ZCeR1sH3FicQuBZIgzyg9nJGG4L+b
Whfd2TTp1NFQZe4Vu5Hx3bqZmYdr0iYcn0h/qTgLvE4xibzMOfeQ1CosCyp4OXGpIY9BfkkbQx52
Jg+6ot8vC+tIuOSK99xlEjYoQXXmpQDlBOBzD4B1IjUeHyIESauQ5ky54UGH1F3AnBR1Hk3ukaA5
Hhyj5guKtTSX7JLyuZlMSKIWzN4FH8l6La7NK6opJuUFJGHuq4QJqo1KIzvjGIRrGRK7qYhUGtWz
tWWTa0UDkoDg240TwZc3TF4/Q0h225UMNDdxrJI2A5lPgKAKU+nyp2BBNX3VK/EPE9RWldUguxGS
GhBIodaJcJrFKdf8XckU4UJAJR1zrA==


--===============1634709645==--