bzr push into mysql-trunk branch (sergey.glukhov:4513 to 4514) WL#6266

[Sergey Glukhov]

 4514 Sergey Glukhov	2012-09-21
      WL#6266
      an attempt to make the test more consistent

    modified:
      mysql-test/r/innodb_pk_extention.result
      mysql-test/t/innodb_pk_extention.test
 4513 Sergey Glukhov	2012-09-20
      WL#6266 Make use of hidden key parts(addon)
      added a check that extended key length 
      does not exceed MAX_KEY_LENGTH.
     @ mysql-test/r/innodb_pk_extention.result
        test fix
     @ mysql-test/suite/opt_trace/r/range_no_prot.result
        test fix
     @ mysql-test/suite/opt_trace/r/range_ps_prot.result
        test fix
     @ mysql-test/t/innodb_pk_extention.test
        test fix
     @ sql/opt_sum.cc
        fixed coding style
     @ sql/table.cc
        added a check that extended key length 
        does not exceed MAX_KEY_LENGTH.

    modified:
      mysql-test/r/innodb_pk_extention.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/t/innodb_pk_extention.test
      sql/opt_sum.cc
      sql/table.cc
=== modified file 'mysql-test/r/innodb_pk_extention.result'
--- a/mysql-test/r/innodb_pk_extention.result	2012-09-20 11:32:21 +0000
+++ b/mysql-test/r/innodb_pk_extention.result	2012-09-21 08:50:56 +0000
@@ -44,7 +44,10 @@ INSERT INTO t1 VALUES
 INSERT INTO t1 SELECT pk_1 + 60, pk_2, f1, f2 FROM t1;
 INSERT INTO t1 SELECT pk_1 + 120, pk_2, f1, f2 FROM t1;
 INSERT INTO t1 SELECT pk_1 + 240, pk_2, f1, f2 FROM t1;
-INSERT INTO t1 SELECT pk_1 + 480, pk_2, f1, f2 FROM t1;
+INSERT INTO t1 SELECT pk_1, pk_2 + 10, f1, f2 FROM t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 
 REF access optimization
 
@@ -54,13 +57,13 @@ id	select_type	table	type	possible_keys	
 FLUSH STATUS;
 SELECT count(*) FROM t1 WHERE pk_1 = 3 and f1 = '2000-01-03';
 count(*)
-1
+2
 SHOW STATUS LIKE 'handler_read%';
 Variable_name	Value
 Handler_read_first	0
 Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	1
+Handler_read_next	2
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -73,31 +76,34 @@ id	select_type	table	type	possible_keys	
 FLUSH STATUS;
 SELECT count(*) FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
 count(*)
-3
+6
 SHOW STATUS LIKE 'handler_read%';
 Variable_name	Value
 Handler_read_first	0
 Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	3
+Handler_read_next	6
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
 EXPLAIN SELECT pk_1, pk_2 FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	PRIMARY,k1	k1	10	NULL	3	Using where; Using index
+1	SIMPLE	t1	range	PRIMARY,k1	k1	10	NULL	6	Using where; Using index
 FLUSH STATUS;
 SELECT pk_1, pk_2 FROM t1 WHERE pk_1 BETWEEN 3 AND 5 AND f1 = '2000-01-03';
 pk_1	pk_2
 3	3
+3	13
 4	3
+4	13
 5	3
+5	13
 SHOW STATUS LIKE 'handler_read%';
 Variable_name	Value
 Handler_read_first	0
 Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	3
+Handler_read_next	6
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -142,7 +148,7 @@ id	select_type	table	type	possible_keys	
 FLUSH STATUS;
 SELECT MAX(pk_1) FROM t1 WHERE f1 = '2000-01-03';
 MAX(pk_1)
-939
+459
 SHOW STATUS LIKE 'handler_read%';
 Variable_name	Value
 Handler_read_first	0
@@ -217,13 +223,13 @@ FLUSH STATUS;
 SELECT count(*) FROM t1 AS t1 JOIN t1 AS t2
 ON t2.pk_1 = t1.pk_1 WHERE t1.f1 = '2000-01-03' AND t2.f1 = '2000-01-03';
 count(*)
-432
+864
 SHOW STATUS LIKE 'handler_read%';
 Variable_name	Value
 Handler_read_first	0
 Handler_read_key	433
 Handler_read_last	0
-Handler_read_next	864
+Handler_read_next	1296
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0

=== modified file 'mysql-test/t/innodb_pk_extention.test'
--- a/mysql-test/t/innodb_pk_extention.test	2012-09-20 11:32:21 +0000
+++ b/mysql-test/t/innodb_pk_extention.test	2012-09-21 08:50:56 +0000
@@ -52,7 +52,9 @@ INSERT INTO t1 VALUES
 INSERT INTO t1 SELECT pk_1 + 60, pk_2, f1, f2 FROM t1;
 INSERT INTO t1 SELECT pk_1 + 120, pk_2, f1, f2 FROM t1;
 INSERT INTO t1 SELECT pk_1 + 240, pk_2, f1, f2 FROM t1;
-INSERT INTO t1 SELECT pk_1 + 480, pk_2, f1, f2 FROM t1;
+INSERT INTO t1 SELECT pk_1, pk_2 + 10, f1, f2 FROM t1;
+
+ANALYZE TABLE t1;
 
 --echo
 --echo REF access optimization

No bundle (reason: useless for push emails).