bk commit into 4.1 tree (jani:1.2634)

[jani]

Below is the list of changes that have just been committed into a local
4.1 repository of jani. When jani 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-04-10 16:37:20+03:00, jani@stripped +3 -0
  Merge jamppa@stripped:/home/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
  MERGE: 1.2631.1.1

  sql-common/my_time.c@stripped, 2007-04-10 16:37:15+03:00, jani@stripped
+0 -0
    Auto merged
    MERGE: 1.19.1.1

  sql/item_cmpfunc.cc@stripped, 2007-04-10 16:37:15+03:00, jani@stripped
+0 -0
    Auto merged
    MERGE: 1.219.1.1

  sql/table.cc@stripped, 2007-04-10 16:37:15+03:00, jani@stripped +0 -0
    Auto merged
    MERGE: 1.142.1.2

# 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:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-4.1-main/RESYNC

--- 1.220/sql/item_cmpfunc.cc	2007-04-10 16:37:30 +03:00
+++ 1.221/sql/item_cmpfunc.cc	2007-04-10 16:37:30 +03:00
@@ -838,6 +838,26 @@
 }
 
 
+bool Item_func_opt_neg::eq(const Item *item, bool binary_cmp) const
+{
+  /* Assume we don't have rtti */
+  if (this == item)
+    return 1;
+  if (item->type() != FUNC_ITEM)
+    return 0;
+  Item_func *item_func=(Item_func*) item;
+  if (arg_count != item_func->arg_count ||
+      functype() != item_func->functype())
+    return 0;
+  if (negated != ((Item_func_opt_neg *) item_func)->negated)
+    return 0;
+  for (uint i=0; i < arg_count ; i++)
+    if (!args[i]->eq(item_func->arguments()[i], binary_cmp))
+      return 0;
+  return 1;
+}
+
+
 void Item_func_interval::fix_length_and_dec()
 {
   if (row->cols() > 8)

--- 1.20/sql-common/my_time.c	2007-04-10 16:37:30 +03:00
+++ 1.21/sql-common/my_time.c	2007-04-10 16:37:30 +03:00
@@ -350,10 +350,7 @@
       l_time->year > 9999 || l_time->month > 12 ||
       l_time->day > 31 || l_time->hour > 23 ||
       l_time->minute > 59 || l_time->second > 59 ||
-      (!(flags & TIME_FUZZY_DATE) &&
-       (l_time->month == 0 || l_time->day == 0)) ||
-      (l_time->year == 0 && l_time->month == 0 && l_time->day ==
0 && 
-       (l_time->hour != 0 || l_time->minute != 0 || l_time->second != 0)))
+      (!(flags & TIME_FUZZY_DATE) && (l_time->month == 0 || l_time->day
== 0)))
   {
     /* Only give warning for a zero date if there is some garbage after */
     if (!not_zero_date)                         /* If zero date */