List:Commits« Previous MessageNext Message »
From:Roy Lyseng Date:September 14 2012 1:21pm
Subject:bzr push into mysql-trunk branch (roy.lyseng:4480 to 4481)
View as plain text  
 4481 Roy Lyseng	2012-09-14 [merge]
      Merge from 5.6

    modified:
      mysql-test/include/subquery_sj.inc
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bkaunique.result
 4480 Roy Lyseng	2012-09-14 [merge]
      Merge from 5.6

    modified:
      mysql-test/include/subquery_sj.inc
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
=== modified file 'mysql-test/include/subquery_sj.inc'
--- a/mysql-test/include/subquery_sj.inc	2012-09-14 11:47:47 +0000
+++ b/mysql-test/include/subquery_sj.inc	2012-09-14 13:19:41 +0000
@@ -4318,6 +4318,13 @@ CREATE TABLE t2 (
 
 INSERT INTO t2 VALUES ('v'), ('y'), ('j'), ('c'), ('d'), ('r');
 
+-- disable_query_log
+-- disable_result_log
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+-- enable_result_log
+-- enable_query_log
+
 let $query=
 SELECT col_varchar_key
 FROM t1

=== modified file 'mysql-test/r/subquery_sj_mat_nosj.result'
--- a/mysql-test/r/subquery_sj_mat_nosj.result	2012-09-14 11:47:47 +0000
+++ b/mysql-test/r/subquery_sj_mat_nosj.result	2012-09-14 13:19:41 +0000
@@ -7528,7 +7528,7 @@ WHERE col_varchar_key IN (SELECT col_var
 FROM t2)
 ORDER BY col_datetime_key LIMIT 4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	21	Using where; Using filesort
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	20	Using where; Using filesort
 2	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	6	NULL
 SELECT col_varchar_key
 FROM t1

=== modified file 'mysql-test/r/subquery_sj_none.result'
--- a/mysql-test/r/subquery_sj_none.result	2012-09-14 11:47:47 +0000
+++ b/mysql-test/r/subquery_sj_none.result	2012-09-14 13:19:41 +0000
@@ -7558,7 +7558,7 @@ WHERE col_varchar_key IN (SELECT col_var
 FROM t2)
 ORDER BY col_datetime_key LIMIT 4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	21	Using where; Using filesort
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	20	Using where; Using filesort
 2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	6	Using where
 SELECT col_varchar_key
 FROM t1

=== modified file 'mysql-test/r/subquery_sj_none_bka.result'
--- a/mysql-test/r/subquery_sj_none_bka.result	2012-09-14 11:47:47 +0000
+++ b/mysql-test/r/subquery_sj_none_bka.result	2012-09-14 13:19:41 +0000
@@ -7559,7 +7559,7 @@ WHERE col_varchar_key IN (SELECT col_var
 FROM t2)
 ORDER BY col_datetime_key LIMIT 4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	21	Using where; Using filesort
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	20	Using where; Using filesort
 2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	6	Using where
 SELECT col_varchar_key
 FROM t1

=== modified file 'mysql-test/r/subquery_sj_none_bkaunique.result'
--- a/mysql-test/r/subquery_sj_none_bkaunique.result	2012-09-14 11:47:47 +0000
+++ b/mysql-test/r/subquery_sj_none_bkaunique.result	2012-09-14 13:19:41 +0000
@@ -7560,7 +7560,7 @@ WHERE col_varchar_key IN (SELECT col_var
 FROM t2)
 ORDER BY col_datetime_key LIMIT 4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	21	Using where; Using filesort
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	20	Using where; Using filesort
 2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	6	Using where
 SELECT col_varchar_key
 FROM t1

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (roy.lyseng:4480 to 4481) Roy Lyseng15 Sep