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

Conflicts:

mysql-test/collections/default.experimental
This commit is contained in:
Alexey Kopytov 2009-12-25 13:56:50 +03:00
commit 3ba6a2a9fa
24 changed files with 424 additions and 75 deletions

View file

@ -215,6 +215,11 @@ public:
{
return has_timestamp_args();
}
virtual bool find_function_processor (uchar *arg)
{
return functype() == *(Functype *) arg;
}
};