From 0b69585dec39febcfc87733c6d1594a8dc3839b6 Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Sun, 29 May 2011 00:41:41 +0400 Subject: [PATCH] Buildbot fixes - Update test results (checked) - Fix compiler warning --- mysql-test/r/group_by.result | 2 +- mysql-test/r/group_min_max.result | 2 +- mysql-test/r/metadata.result | 6 +++--- sql/sql_select.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 96ef813f4b9..54c8999adca 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -1543,7 +1543,7 @@ EXPLAIN SELECT 1 FROM t1 WHERE a IN (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2)); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 index PRIMARY,i2 PRIMARY 4 NULL 144 Using index -1 PRIMARY eq_ref distinct_key distinct_key 4 func 1 +1 PRIMARY t1 ALL NULL NULL NULL NULL 144 Using where; FirstMatch(t1) CREATE TABLE t2 (a INT, b INT, KEY(a)); INSERT INTO t2 VALUES (1, 1), (2, 2), (3,3), (4,4); EXPLAIN SELECT a, SUM(b) FROM t2 GROUP BY a LIMIT 2; diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result index 8f6b57da25a..20b0c054480 100644 --- a/mysql-test/r/group_min_max.result +++ b/mysql-test/r/group_min_max.result @@ -2401,7 +2401,7 @@ id select_type table type possible_keys key key_len ref rows Extra EXPLAIN SELECT 1 FROM t1 AS t1_outer WHERE a IN (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY ALL distinct_key NULL NULL NULL 8 Using where +1 PRIMARY t1_outer index NULL a 10 NULL 15 Using where; Using index 2 DEPENDENT SUBQUERY t1 index NULL a 10 NULL 1 Using index EXPLAIN SELECT 1 FROM t1 AS t1_outer GROUP BY a HAVING a > (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2); diff --git a/mysql-test/r/metadata.result b/mysql-test/r/metadata.result index e7f4527e080..2f9fb6b67f5 100644 --- a/mysql-test/r/metadata.result +++ b/mysql-test/r/metadata.result @@ -55,7 +55,7 @@ id data data 2 female no select t1.id from t1 union select t2.id from t2; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def id id 1 4 1 Y 49152 0 63 +def id id 1 4 1 Y 32768 0 63 id 1 2 @@ -66,7 +66,7 @@ insert into t1 values (2,'two'); set @arg00=1 ; select @arg00 FROM t1 where a=1 union distinct select 1 FROM t1 where a=1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def @arg00 @arg00 8 20 1 Y 49152 0 63 +def @arg00 @arg00 8 20 1 Y 32768 0 63 @arg00 1 select * from (select @arg00) aaa; @@ -76,7 +76,7 @@ def aaa @arg00 @arg00 8 20 1 Y 32768 0 63 1 select 1 union select 1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def 1 1 8 20 1 N 49153 0 63 +def 1 1 8 20 1 N 32769 0 63 1 1 select * from (select 1 union select 1) aaa; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fb5afc7055c..c4b7add0132 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5926,7 +5926,7 @@ void JOIN::get_partial_cost_and_fanout(uint end_tab_idx, { double record_count= 1; double read_time= 0.0; - double sj_inner_fanout; + double sj_inner_fanout= 1.0; JOIN_TAB *end_tab= NULL; JOIN_TAB *tab; uint i;