From: Marc Alff
Date: April 20 2011 5:57pm
Subject: bzr push into mysql-trunk branch (marc.alff:3328 to 3329)
List-Archive: http://lists.mysql.com/commits/135840
Message-Id: <201104201757.p3KHvXO2000614@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3329 Marc Alff	2011-04-20
      test cleanup.

    modified:
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/t/misc.test
 3328 Jon Olav Hauglid	2011-04-20 [merge]
      Null merge from mysql-5.5 to mysql-trunk

=== 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;
 

No bundle (reason: useless for push emails).