From: Marc Alff
Date: February 16 2011 2:38pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3656)
List-Archive: http://lists.mysql.com/commits/131437
Message-Id: <201102161438.p1G4e5rp003822@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8531587079930165310=="

--===============8531587079930165310==
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-trunk-cleanup/ based on revid:tor.didriksen@stripped

 3656 Marc Alff	2011-02-16
      Fixed the table aggregation tests to be more robust,
      to avoid spurious failures.

    modified:
      mysql-test/suite/perfschema/include/table_aggregate_setup.inc
=== modified file 'mysql-test/suite/perfschema/include/table_aggregate_setup.inc'
--- a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc	2010-12-09 16:39:45 +0000
+++ b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc	2011-02-16 14:38:29 +0000
@@ -132,6 +132,10 @@ update performance_schema.setup_instrume
 # Enable all consumers (by default)
 update performance_schema.setup_consumers set enabled='YES';
 
+# Start from a known clean state, to avoid noise from previous tests
+flush tables;
+flush status;
+
 create table test.t1(a int, b int, c int, d int default 0,
   primary key(a),
   index index_b(b),


--===============8531587079930165310==
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:///Users/malff/BZR_TREE/mysql-trunk-cleanup/
# testament_sha1: ce01a499ab0f9adc0ce69a0416f40183bc38fbba
# timestamp: 2011-02-16 15:38:36 +0100
# base_revision_id: tor.didriksen@stripped\
#   x0arzdm3jg20w7ie
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWEMZsAAAYXfgAAQWGf//3MC
CAC////wUAODbWSe5rdnZ2DJAiYmIzJpMSeVPaUeptJp5DUMgkoJkwpjTRUZqaeU2kNAMgGQJJAR
GyQ1T2ibQo9qnlP1QAADGGhoAAANAAAAACURTJp6jTEPUNANAAAaAPnitP3XyELrbBsqXMAN7KPd
TG3IqNs2/nKiIO3oPhjkEzFrwG/rsv7+l522L7fNa/X1VYvwqdAxk3daTraGwZzz3Wvzo6BSA48r
7XTvV/BaCFi7kHyqBg34s0L7JHgCkkXnxhW6ON2eZMXZmvzFkhbIA5kDQ6Peppy/yoLfyKk4ZZns
eK/x1yWqO2AfOiCvEvvAQ12DllFrdGeFBAote4sBU6M0tRI4HYFbOlvHSsN/Atg/ERBMlKHwdzYR
rPUfFRlxzE62Uxwd+0DuLljSPp4VcNTFQw2vgK7Gm4i51V3FyhutabMmOVJKCVu90XbZqBUcYmZ0
MtQqFVGznO814GQrJK+JtsJ3Mr6SSHtfBlRWrmYxMOFE1NHcOHWZMxmQ5SxlNevzVrSu0Vxl56kc
3vMKSrMwsaMzKC3CdUwx2whFTozn/jKNKxc51XW1aUi95KT002kSCcmmvBocdN2umjD/L6dcpJkr
ZGphj8O3kHK6bkU0coEd0FVthxIO4TRpiePCQfLZolgD2kz9QGt8jold6nAkQhyI0ZpRisjM8CHJ
+nB1wd1pIu8/zoBa9ABqJNQg0kY6+ALlISKvNuBIp6YyhLq/K4NoExaUkYd1dYk2nEaGQB93QVYR
jVlzkBSIBYHt1v4+qw4X885tR1AsB6q8y6+VnBr+bQ5uw2pGAGNzcEd3UOBkH0UN8YNoa+mIcHFp
CiuzaIKAMylA5AcUvhiYPaY1F+pAJoHhhQJ8gXCa0rAuUyWgnE9jTtMu9dabbopPMhSXUr4G/d8P
sGv747ulgBR5WoBH/Ny1PbJ+CQwAhkfriBQBR9gsDN0xIRRRQV85EC7rsdJSIAHUZlWHsMwiuOR1
BqZONeM0XOLub4himlGDIe1uEc5oiym5buy8XmZ6XHAFNHseRXmkMC81yctcSdoytsxicPjzJuhB
5aC9F01Jc3oG9AaiU5c6EunJRmsNbkJ9VZ4xYnJshj2sbo3adJK6VTA0bACxJJ3Jaa7laVgYLHes
32ryKuagZD+UnJlfEO/d0MbqD4cmetQVDFxN6x2q2h6xWY35apatccthF50kqIodVCeAqquyxVzy
HGguzykFMn5i7kinChIMIYzYAA==


--===============8531587079930165310==--