Merged the fix for bug 777745 into 5.3.

1 files changed, 15 insertions, 0 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 688614c333c..90dbffb0a05 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -252,6 +252,21 @@ public:
   }
 
   /*
+    By default only substitution for a field whose two different values
+    are never equal is allowed in the arguments of a function.
+    This is overruled for the direct arguments of comparison functions.
+  */ 
+  bool subst_argument_checker(uchar **arg) 
+  { 
+    if (*arg)
+    {
+      *arg= (uchar *) Item::IDENTITY_SUBST;
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /*
     We assume the result of any function that has a TIMESTAMP argument to be
     timezone-dependent, since a TIMESTAMP value in both numeric and string
     contexts is interpreted according to the current timezone.