bzr commit into mysql-next-mr-bugfixing branch (epotemkin:3164) Bug#31399

[Evgeny Potemkin]

#At file:///work/bzrroot/backporting-next-mr-bugfixing/ based on revid:epotemkin@stripped

 3164 Evgeny Potemkin	2010-05-11
      Backporting: fixed lame merge of the fix for the bug#31399.
      Test case result adjusted accordingly.

    modified:
      mysql-test/r/greedy_optimizer.result
      mysql-test/r/join_cache.result
      sql/sql_select.cc
=== modified file 'mysql-test/r/greedy_optimizer.result'
--- a/mysql-test/r/greedy_optimizer.result	2010-05-10 09:37:24 +0000
+++ b/mysql-test/r/greedy_optimizer.result	2010-05-11 16:19:31 +0000
@@ -311,7 +311,7 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 show status like 'Last_query_cost';
 Variable_name	Value
-Last_query_cost	795.025561
+Last_query_cost	795.014136
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	3	
@@ -323,7 +323,7 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 show status like 'Last_query_cost';
 Variable_name	Value
-Last_query_cost	795.025561
+Last_query_cost	795.014136
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	3	
@@ -543,7 +543,7 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 show status like 'Last_query_cost';
 Variable_name	Value
-Last_query_cost	795.025561
+Last_query_cost	795.014136
 explain select t1.c11 from t7, t6, t5, t4, t3, t2, t1 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	3	
@@ -555,7 +555,7 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	18	Using where; Using join buffer
 show status like 'Last_query_cost';
 Variable_name	Value
-Last_query_cost	795.025561
+Last_query_cost	795.014136
 explain select t1.c11 from t1, t2, t3, t4, t5, t6, t7 where t1.c11 = t2.c21 and t1.c12 = t3.c31 and t1.c13 = t4.c41 and t1.c14 = t5.c51 and t1.c15 = t6.c61 and t1.c16 = t7.c71 and t2.c22 = t3.c32 and t2.c23 = t4.c42 and t2.c24 = t5.c52 and t2.c25 = t6.c62 and t2.c26 = t7.c72 and t3.c33 = t4.c43 and t3.c34 = t5.c53 and t3.c35 = t6.c63 and t3.c36 = t7.c73 and t4.c42 = t5.c54 and t4.c43 = t6.c64 and t4.c44 = t7.c74 and t5.c52 = t6.c65 and t5.c53 = t7.c75 and t6.c62 = t7.c76;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	3	

=== modified file 'mysql-test/r/join_cache.result'
--- a/mysql-test/r/join_cache.result	2010-05-10 12:40:54 +0000
+++ b/mysql-test/r/join_cache.result	2010-05-11 16:19:31 +0000
@@ -3028,8 +3028,8 @@ Istanbul	Turkey
 St Petersburg	Russian Federation
 Moscow	Russian Federation
 Ho Chi Minh City	Vietnam
-New York	United States
 Los Angeles	United States
+New York	United States
 set join_buffer_size=default;
 set optimizer_join_cache_level=6;
 ALTER TABLE Country MODIFY Name varchar(52) NOT NULL default '';

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-05-10 14:26:07 +0000
+++ b/sql/sql_select.cc	2010-05-11 16:19:31 +0000
@@ -7819,7 +7819,9 @@ void calc_used_field_length(THD *thd, JO
       if (flags & BLOB_FLAG)
 	blobs++;
       if (!(flags & NOT_NULL_FLAG))
-	null_fields++;
+        null_fields++;
+      if (field->type() == MYSQL_TYPE_BIT &&
+          ((Field_bit*)field)->bit_len)
         uneven_bit_fields++;
     }
   }


Attachment: [text/bzr-bundle] bzr/[e-mail]