[Commits] Rev 3384: Adjust test results after Monty's push of the new in file:///home/tsk/mprog/src/5.3/

timour at askmonty.org timour at askmonty.org
Wed Jan 18 12:54:06 EET 2012


At file:///home/tsk/mprog/src/5.3/

------------------------------------------------------------
revno: 3384
revision-id: timour at askmonty.org-20120118105350-47hlgw7goy1nqn5v
parent: sanja at montyprogram.com-20120117131600-zv0edv867r98g5lo
committer: timour at askmonty.org
branch nick: 5.3
timestamp: Wed 2012-01-18 12:53:50 +0200
message:
  Adjust test results after Monty's push of the new
  handler counter Handler_read_rnd_deleted.
-------------- next part --------------
=== modified file 'mysql-test/r/insert_select.result'
--- a/mysql-test/r/insert_select.result	2011-05-02 17:58:45 +0000
+++ b/mysql-test/r/insert_select.result	2012-01-18 10:53:50 +0000
@@ -697,6 +697,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   1
 DROP TABLE t1;
 CREATE TABLE t1 (

=== modified file 'mysql-test/r/join.result'
--- a/mysql-test/r/join.result	2011-12-24 16:55:10 +0000
+++ b/mysql-test/r/join.result	2012-01-18 10:53:50 +0000
@@ -860,6 +860,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   5
 drop table t1, t2, t3;
 create table t1 (a int);
@@ -1269,6 +1270,7 @@ Handler_read_key	1
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   1
 DROP TABLE t1, t2;
 End of 5.1 tests

=== modified file 'mysql-test/r/select.result'
--- a/mysql-test/r/select.result	2011-12-24 16:55:10 +0000
+++ b/mysql-test/r/select.result	2012-01-18 10:53:50 +0000
@@ -4342,6 +4342,7 @@ Handler_read_key	2
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   6
 DROP TABLE t1, t2;
 CREATE TABLE t1 (f1 bigint(20) NOT NULL default '0',

=== modified file 'mysql-test/r/select_jcl6.result'
--- a/mysql-test/r/select_jcl6.result	2011-12-24 16:55:10 +0000
+++ b/mysql-test/r/select_jcl6.result	2012-01-18 10:53:50 +0000
@@ -4353,7 +4353,8 @@ Handler_read_key	2
 Handler_read_next       10
 Handler_read_prev       0
 Handler_read_rnd        10
-Handler_read_rnd_next   7
+Handler_read_rnd_deleted        1
+Handler_read_rnd_next   6
 DROP TABLE t1, t2;
 CREATE TABLE t1 (f1 bigint(20) NOT NULL default '0',
 f2 int(11) NOT NULL default '0',

=== modified file 'mysql-test/r/subselect3.result'
--- a/mysql-test/r/subselect3.result	2011-12-24 16:55:10 +0000
+++ b/mysql-test/r/subselect3.result	2012-01-18 10:53:50 +0000
@@ -124,6 +124,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   50
 select 'No key lookups, seq reads: 29= 5 reads from t2 + 4 * 6 reads from t1.' Z;
 Z

=== modified file 'mysql-test/r/subselect3_jcl6.result'
--- a/mysql-test/r/subselect3_jcl6.result	2011-12-24 16:55:10 +0000
+++ b/mysql-test/r/subselect3_jcl6.result	2012-01-18 10:53:50 +0000
@@ -134,6 +134,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   50
 select 'No key lookups, seq reads: 29= 5 reads from t2 + 4 * 6 reads from t1.' Z;
 Z

=== modified file 'mysql-test/r/subselect_cache.result'
--- a/mysql-test/r/subselect_cache.result	2011-12-15 08:21:15 +0000
+++ b/mysql-test/r/subselect_cache.result	2012-01-18 10:53:50 +0000
@@ -36,6 +36,7 @@ Handler_read_key	7
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   31
 set optimizer_switch='subquery_cache=off';
 flush status;
@@ -62,6 +63,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   61
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (where)
@@ -87,6 +89,7 @@ Handler_read_key	7
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   31
 set optimizer_switch='subquery_cache=off';
 flush status;
@@ -111,6 +114,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   61
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (having)
@@ -136,6 +140,7 @@ Handler_read_key	7
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   31
 set optimizer_switch='subquery_cache=off';
 flush status;
@@ -160,6 +165,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   61
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (OUTER JOIN ON)
@@ -257,6 +263,7 @@ Handler_read_key	7
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   442
 set optimizer_switch='subquery_cache=off';
 flush status;
@@ -353,6 +360,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   472
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (GROUP BY)
@@ -374,6 +382,7 @@ Handler_read_key	17
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        4
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   36
 set optimizer_switch='subquery_cache=off';
 flush status;
@@ -394,6 +403,7 @@ Handler_read_key	10
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        4
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   86
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (distinct GROUP BY)
@@ -415,6 +425,7 @@ Handler_read_key	17
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        4
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   41
 set optimizer_switch='subquery_cache=off';
 flush status;
@@ -435,6 +446,7 @@ Handler_read_key	10
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        4
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   91
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (ORDER BY)
@@ -462,6 +474,7 @@ Handler_read_key	7
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        10
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   42
 set optimizer_switch='subquery_cache=off';
 flush status;
@@ -488,6 +501,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        10
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   72
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (distinct ORDER BY)
@@ -509,7 +523,8 @@ Handler_read_key	7
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        4
-Handler_read_rnd_next   37
+Handler_read_rnd_deleted        1
+Handler_read_rnd_next   36
 set optimizer_switch='subquery_cache=off';
 flush status;
 select distinct a from t1 ORDER BY (select d from t2 where b=c);
@@ -529,7 +544,8 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        4
-Handler_read_rnd_next   67
+Handler_read_rnd_deleted        1
+Handler_read_rnd_next   66
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (LEFT JOIN ON)
 flush status;
@@ -626,6 +642,7 @@ Handler_read_key	70
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   141
 set optimizer_switch='subquery_cache=off';
 flush status;
@@ -722,6 +739,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   671
 set optimizer_switch='subquery_cache=on';
 #single value subquery test (PS)
@@ -1345,6 +1363,7 @@ Handler_read_key	11
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   145
 set optimizer_switch='subquery_cache=on';
 flush status;
@@ -1373,6 +1392,7 @@ Handler_read_key	32
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   84
 #several subqueries (several levels)
 set optimizer_switch='subquery_cache=off';
@@ -1404,6 +1424,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   127
 set optimizer_switch='subquery_cache=on';
 flush status;
@@ -1432,6 +1453,7 @@ Handler_read_key	13
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   69
 #clean up
 drop table t1,t2;
@@ -1621,6 +1643,7 @@ Handler_read_key	15
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        8
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   57
 set optimizer_switch='subquery_cache=on';
 flush status;
@@ -1645,6 +1668,7 @@ Handler_read_key	21
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        8
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   37
 argument of aggregate function as parameter of subquery (illegal use)
 set optimizer_switch='subquery_cache=off';
@@ -1670,6 +1694,7 @@ Handler_read_key	15
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        8
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   57
 set optimizer_switch='subquery_cache=on';
 flush status;
@@ -1694,6 +1719,7 @@ Handler_read_key	22
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        8
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   41
 drop table t1,t2;
 #test of flattening subquery optimisations and cache
@@ -1734,6 +1760,7 @@ Handler_read_key	15
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   16
 alter table t2 drop primary key;
 set optimizer_switch='default,semijoin=off,materialization=off,subquery_cache=off';
@@ -1770,6 +1797,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   151
 set optimizer_switch='default,semijoin=off,materialization=off,subquery_cache=on';
 explain select * from t1 where a in (select pk from t2);
@@ -1805,6 +1833,7 @@ Handler_read_key	15
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   43
 set optimizer_switch='default,semijoin=off,materialization=on,subquery_cache=on';
 explain select * from t1 where a in (select pk from t2);
@@ -1840,6 +1869,7 @@ Handler_read_key	18
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   27
 drop table t0,t1,t2;
 set optimizer_switch='default';

=== modified file 'mysql-test/r/update.result'
--- a/mysql-test/r/update.result	2010-07-19 09:03:52 +0000
+++ b/mysql-test/r/update.result	2012-01-18 10:53:50 +0000
@@ -276,6 +276,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   0
 flush status;
 update t1 set a=9999 order by a limit 1;
@@ -287,6 +288,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        2
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   9
 flush status;
 delete from t1 order by a limit 1;
@@ -297,6 +299,7 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   0
 flush status;
 delete from t1 order by a desc limit 1;
@@ -307,7 +310,8 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        1
-Handler_read_rnd_next   9
+Handler_read_rnd_deleted        1
+Handler_read_rnd_next   8
 alter table t1 disable keys;
 flush status;
 delete from t1 order by a limit 1;
@@ -318,7 +322,8 @@ Handler_read_key	0
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        1
-Handler_read_rnd_next   9
+Handler_read_rnd_deleted        2
+Handler_read_rnd_next   7
 select * from t1;
 a       b
 0       0
@@ -371,6 +376,7 @@ Handler_read_key	1
 Handler_read_next       1
 Handler_read_prev       0
 Handler_read_rnd        1
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   0
 drop table t1, t2;
 create table t1(f1 int, `*f2` int);
@@ -408,6 +414,7 @@ Handler_read_key	1
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   0
 SELECT user_id FROM t1 WHERE request_id=999999999999999999999999999999;
 user_id
@@ -418,6 +425,7 @@ Handler_read_key	2
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   0
 UPDATE t1 SET user_id=null WHERE request_id=9999999999999;
 show status like '%Handler_read%';
@@ -427,6 +435,7 @@ Handler_read_key	3
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   0
 UPDATE t1 SET user_id=null WHERE request_id=999999999999999999999999999999;
 show status like '%Handler_read%';
@@ -436,6 +445,7 @@ Handler_read_key	3
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   0
 DROP TABLE t1;
 CREATE TABLE t1 (

=== modified file 'mysql-test/r/view.result'
--- a/mysql-test/r/view.result	2011-12-15 08:21:15 +0000
+++ b/mysql-test/r/view.result	2012-01-18 10:53:50 +0000
@@ -3959,6 +3959,7 @@ Handler_read_key	1
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   17
 CREATE VIEW v AS SELECT * FROM t2;
 EXPLAIN EXTENDED
@@ -3980,6 +3981,7 @@ Handler_read_key	1
 Handler_read_next       0
 Handler_read_prev       0
 Handler_read_rnd        0
+Handler_read_rnd_deleted        0
 Handler_read_rnd_next   17
 DROP VIEW v;
 DROP TABLE t1, t2;



More information about the commits mailing list