mirror of
https://github.com/MariaDB/server.git
synced 2026-05-04 14:15:33 +02:00
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts: mysql-test/collections/default.experimental
This commit is contained in:
commit
3ba6a2a9fa
24 changed files with 424 additions and 75 deletions
|
|
@ -215,6 +215,11 @@ public:
|
|||
{
|
||||
return has_timestamp_args();
|
||||
}
|
||||
|
||||
virtual bool find_function_processor (uchar *arg)
|
||||
{
|
||||
return functype() == *(Functype *) arg;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue