bk commit into 4.1 tree (evgen:1.2490) BUG#16377

[eugene]

Below is the list of changes that have just been committed into a local
4.1 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
  1.2490 06/06/15 16:39:18 evgen@stripped +2 -0
  item_cmpfunc.h, cast.result:
    Post fix for bug#16377

  sql/item_cmpfunc.h
    1.115 06/06/15 16:38:50 evgen@stripped +5 -10
    Post fix for bug#16377

  mysql-test/r/cast.result
    1.27 06/06/15 16:38:27 evgen@stripped +1 -1
    Post fix for bug#16377

# 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:	/work/16377-4.1-after

--- 1.114/sql/item_cmpfunc.h	2006-06-13 18:24:34 +04:00
+++ 1.115/sql/item_cmpfunc.h	2006-06-15 16:38:50 +04:00
@@ -43,11 +43,8 @@
   int set_compare_func(Item_bool_func2 *owner, Item_result type);
   inline int set_compare_func(Item_bool_func2 *owner_arg)
   {
-    Item_result ar= (*a)->result_as_longlong() && (*b)->const_item() ?
-                      INT_RESULT : (*a)->result_type();
-    Item_result br= (*b)->result_as_longlong() && (*a)->const_item() ?
-                      INT_RESULT : (*b)->result_type();
-    return set_compare_func(owner_arg, item_cmp_type(ar, br));
+    return set_compare_func(owner_arg, item_cmp_type((*a)->result_type(),
+                                                     (*b)->result_type()));
   }
   inline int set_cmp_func(Item_bool_func2 *owner_arg,
 			  Item **a1, Item **a2,
@@ -60,11 +57,9 @@
   inline int set_cmp_func(Item_bool_func2 *owner_arg,
 			  Item **a1, Item **a2)
   {
-    Item_result ar= (*a1)->result_as_longlong() && (*a2)->const_item() ?
-                      INT_RESULT : (*a1)->result_type();
-    Item_result br= (*a2)->result_as_longlong() && (*a1)->const_item() ?
-                      INT_RESULT : (*a2)->result_type();
-    return set_cmp_func(owner_arg, a1, a2, item_cmp_type(ar, br));
+    return set_cmp_func(owner_arg, a1, a2,
+                        item_cmp_type((*a1)->result_type(),
+                                      (*a2)->result_type()));
   }
   inline int compare() { return (this->*func)(); }
 

--- 1.26/mysql-test/r/cast.result	2006-06-13 18:23:26 +04:00
+++ 1.27/mysql-test/r/cast.result	2006-06-15 16:38:27 +04:00
@@ -192,7 +192,7 @@
 1
 select cast("1:2:3" as TIME) = "1:02:03";
 cast("1:2:3" as TIME) = "1:02:03"
-1
+0
 select cast(NULL as DATE);
 cast(NULL as DATE)
 NULL