From: Marc Alff
Date: April 20 2011 5:56pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3329)
List-Archive: http://lists.mysql.com/commits/135839
Message-Id: <201104201757.p3KHv8xe022916@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5403201717143726422=="

--===============5403201717143726422==
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:jon.hauglid@stripped

 3329 Marc Alff	2011-04-20
      test cleanup.

    modified:
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/t/misc.test
=== modified file 'mysql-test/suite/perfschema/r/misc.result'
--- a/mysql-test/suite/perfschema/r/misc.result	2011-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/misc.result	2011-04-20 17:56:53 +0000
@@ -27,12 +27,12 @@ where file_name like "%ghost%";
 FILE_NAME	EVENT_NAME	OPEN_COUNT
 select * from performance_schema.no_such_table;
 ERROR 42S02: Table 'performance_schema.no_such_table' doesn't exist
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (i INT, j INT, KEY(i)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES
+DROP TABLE IF EXISTS t_60905;
+CREATE TABLE t_60905 (i INT, j INT, KEY(i)) ENGINE = InnoDB;
+INSERT INTO t_60905 VALUES
 (1,2), (3,4), (5,6), (7,8), (9,10);
-DELETE FROM t1 WHERE i = 1;
-DELETE FROM t1 WHERE j = 8;
+DELETE FROM t_60905 WHERE i = 1;
+DELETE FROM t_60905 WHERE j = 8;
 SELECT object_schema,
 object_name,
 index_name,
@@ -42,8 +42,8 @@ count_update,
 count_delete
 FROM performance_schema.table_io_waits_summary_by_index_usage
 WHERE object_schema = 'test'
-   AND object_name = 't1';
+   AND object_name = 't_60905';
 object_schema	object_name	index_name	count_fetch	count_insert	count_update	count_delete
-test	t1	i	2	0	0	1
-test	t1	NULL	5	5	0	1
-DROP TABLE t1;
+test	t_60905	i	2	0	0	1
+test	t_60905	NULL	5	5	0	1
+DROP TABLE t_60905;

=== modified file 'mysql-test/suite/perfschema/t/misc.test'
--- a/mysql-test/suite/perfschema/t/misc.test	2011-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/t/misc.test	2011-04-20 17:56:53 +0000
@@ -88,17 +88,17 @@ select * from performance_schema.no_such
 #
 
 --disable_warnings
-DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t_60905;
 --enable_warnings
-CREATE TABLE t1 (i INT, j INT, KEY(i)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES
+CREATE TABLE t_60905 (i INT, j INT, KEY(i)) ENGINE = InnoDB;
+INSERT INTO t_60905 VALUES
 (1,2), (3,4), (5,6), (7,8), (9,10);
 
 # should delete with a "single" PRIMARY lookup (2 PRIMARY fetch, 1 PRIMARY delete)
-DELETE FROM t1 WHERE i = 1;
+DELETE FROM t_60905 WHERE i = 1;
 
 # should delete with a full scan (5 NULL fetch, 1 NULL delete)
-DELETE FROM t1 WHERE j = 8;
+DELETE FROM t_60905 WHERE j = 8;
 
 # show the instrument data
 SELECT object_schema,
@@ -110,7 +110,7 @@ SELECT object_schema,
        count_delete
   FROM performance_schema.table_io_waits_summary_by_index_usage
  WHERE object_schema = 'test'
-   AND object_name = 't1';
+   AND object_name = 't_60905';
 
-DROP TABLE t1;
+DROP TABLE t_60905;
 


--===============5403201717143726422==
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: f0f7cf471250e8e3693b34204431effbc3116283
# timestamp: 2011-04-20 11:57:00 -0600
# base_revision_id: jon.hauglid@stripped\
#   ltewvyapt0n52itj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZxbYkMAArdfgAAwUOf//3/v
3+C////wUAUY9rVUpCNrFGVAkoiJkGhptJ6J+SZRk00MhpjRGEGRkBxkyaaYTIyBgRiaMEYQaNMA
AgkSBJkG1EZR7SjSeoaPSMgGTT1NANqAHGTJpphMjIGBGJowRhBo0wACCSSZGgBGEJ6CmFMT1Bo0
/VAbUZptFBpsz2Lvjzs8Dx16+kl6WQOH+3Hn4Gkks+ulsqNw+bIKpBcl0eqdbVoqvbOuc7SOo7Ch
Tie0yGDaG1+/JFWGNsp8cJtlIm4xLF5x2PVIsPDCCDAnKTs0W8PAoPifWXl2Z3jxQJTmWnWfkSjF
4sKz5f9KfFikWDxPtqITKTg0uEIS2R3GOe+2dPtGiBiDnLQf0NVxN5vDcWmbLohQfcAy07Ze1eUO
kwrjF3ckdol4ZKQuBGqhxPUuZzsINGxdJ7ZFxI3CiBLoQUCUV24mAKEB3xJQCIQTfVy5uK4UeoW1
bKZoLu0oCT3OQ4VMpimZQrIXiNelaJAwk+Anz1W4wMKfebSH7EQbApF1V0lN8BGeXMnNfLbxpJm4
/0Cx4ufSqnoXXIUk0LEUASldRTx3NJM17pbtx94FkYmLrlcj8RaE4w9RUC4veA4UgPI7b6ZbSsiR
NMGgVkHE5YX9gGBdWUm81msDgPYbrKA19RIZKAUGONyg0xMjfImt649OHAmaC3FZexRU1jmkAch3
As61oA+MExcSZgeoyMKgp3mU6q6rrheYBGEoG2ZthMSmpg2VQIkhfbXAwMYIVjVqCli23fjq4EpS
mOGZYGezdTA1xsuYATKj/wCc8IjWARUc2X1ayRjJ9mmJtxMpXhRhem91Ci1yVLSB2dVVFr2je/ZE
RGDeZ9qugl8fkI0OUm2ur2nbzJpoO4XvMj6B7MW02/rPcKEh8z1jgHE4fwMeQOBiecKDxDmdCYHn
Q6DgpPMHHmWDhegwR0FqCnWeAe1xWQGA92JiBMEA9DxDIJAlNZORHBaKAUkhiXDoCgEwBLYGjEMM
Pq0ILwmQClx9pd/u/BPlEsJwVIEd6R+FwvOp+K3fp6kjWk1wX1AednA+71+s5EoIG/pL36KcDAJc
wKMVIskgVnSPzEMQuUqOfQYwSmz8hLDiVCzAdfkZY7JRiodXhgrgiDTm2UCFOOB+dJWRJ6+Cp6uB
+4g8v93mZqT2xO4ibNR3M6kpRE4yFBT1783zO1btKnsejHYv5TBHXqjRng8TTAOAdhdAeSRkKSrg
rW+txMWyIVdp1EorieRCcqwqNhzqQqD/A0mNhZ6/kihOhvWQnFHiiqrG2S9GguKO5OkLKApNBvoK
hcA2YNeLBFh9MwsRY4N5ESYGPfvSMz2J2XAOpUe1C1ANrPE+aYdpxVISXFasb6YVqFZI7U1yPIVo
ib27vYaHIVGFiFp6BaFTI380laqYd0z/hLzIxXohXz6/SbOLGElOlnPvXK0dswUUg7HpB7FHjWpt
0Vc6x73su1KsksyFWmS0eJRDLB8nzYAVQ09Rm+1rhB0zVO43ge8YIHA8woa3IrzVanBvtFXs4zGS
qRYGcHA+QWUVwmU0w54DlkjkbloL3APTgGRHITHenAcqLVLaf+LuSKcKEhOLbEhg


--===============5403201717143726422==--