diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-25 13:56:50 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-25 13:56:50 +0300 |
commit | 24fc798fc7a993a60b3f8dbfc56b37005dcdf530 (patch) | |
tree | d33ce0a47fbf5181f9c5ebfeddb7830a2e9f7223 /sql/item_func.h | |
parent | 1d13320d9aebc198f0b84c8c1454f92978b3e89b (diff) | |
parent | b367b03bcb3be508f0ffad37e9aa78f62c680252 (diff) | |
download | mariadb-git-24fc798fc7a993a60b3f8dbfc56b37005dcdf530.tar.gz |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
mysql-test/collections/default.experimental
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 5 |
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; + } }; |