Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Conflicts:

mysql-test/collections/default.experimental

1 files changed, 5 insertions, 0 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index e3690232904..6bfdae8d56d 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -215,6 +215,11 @@ public:
   {
     return has_timestamp_args();
   }
+
+  virtual bool find_function_processor (uchar *arg)
+  {
+    return functype() == *(Functype *) arg;
+  }
 };