bk commit into 5.0 tree (evgen:1.2434) BUG#22331

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-08 00:27:42+03:00, evgen@stripped +3 -0
  sql_select.cc:
    Postfix for bug#22331 for windows platform.
  explain.test, explain.result:
    Cleanup after bugfix#22331.

  mysql-test/r/explain.result@stripped, 2007-03-08 00:27:00+03:00, evgen@stripped +1 -0
    Cleanup after bugfix#22331.

  mysql-test/t/explain.test@stripped, 2007-03-08 00:26:50+03:00, evgen@stripped +1 -0
    Cleanup after bugfix#22331.

  sql/sql_select.cc@stripped, 2007-03-08 00:27:05+03:00, evgen@stripped +1 -1
    Postfix for bug#22331 for windows platform.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/mnt/gentoo64/work/22331-bug-5.0-opt-mysql

--- 1.498/sql/sql_select.cc	2007-03-07 22:23:06 +03:00
+++ 1.499/sql/sql_select.cc	2007-03-08 00:27:05 +03:00
@@ -7622,7 +7622,7 @@
       }
     }
     if (!((Item_cond*)cond)->argument_list()->elements)
-      cond= new Item_int(cond->val_bool());
+      cond= new Item_int((int32)cond->val_bool());
 
   }
   else if (cond->type() == Item::FUNC_ITEM && 

--- 1.18/mysql-test/r/explain.result	2007-03-07 21:31:36 +03:00
+++ 1.19/mysql-test/r/explain.result	2007-03-08 00:27:00 +03:00
@@ -85,4 +85,5 @@
 1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	
 Warnings:
 Note	1003	select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1`
having 1
+drop view v1;
 drop table t1;

--- 1.11/mysql-test/t/explain.test	2007-03-07 21:31:28 +03:00
+++ 1.12/mysql-test/t/explain.test	2007-03-08 00:26:50 +03:00
@@ -63,6 +63,7 @@
 explain extended select * from t1 where 1;
 explain extended select * from t1 having 0;
 explain extended select * from t1 having 1;
+drop view v1;
 drop table t1;
 
 # End of 5.0 tests.