mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

lots of post-merge changes

Browse source
This commit is contained in:
Sergei Golubchik 2011-04-25 17:22:25 +02:00
commit 0accbd0364
738 changed files with 9203 additions and 10969 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/item_create.cc
View file

@ -1837,7 +1837,7 @@ protected:
class Create_func_sha2 : public Create_func_arg2
{
public:
virtual Item* create(THD *thd, Item *arg1, Item *arg2);
virtual Item* create_2_arg(THD *thd, Item *arg1, Item *arg2);
static Create_func_sha2 s_singleton;
@ -2074,7 +2074,7 @@ protected:
class Create_func_to_seconds : public Create_func_arg1
{
public:
virtual Item* create(THD *thd, Item *arg1);
virtual Item* create_1_arg(THD *thd, Item *arg1);
static Create_func_to_seconds s_singleton;
@ -4382,7 +4382,7 @@ Create_func_sha::create_1_arg(THD *thd, Item *arg1)
Create_func_sha2 Create_func_sha2::s_singleton;
Item*
Create_func_sha2::create(THD *thd, Item *arg1, Item *arg2)
Create_func_sha2::create_2_arg(THD *thd, Item *arg1, Item *arg2)
{
return new (thd->mem_root) Item_func_sha2(arg1, arg2);
}
@ -4570,7 +4570,7 @@ Create_func_to_days::create_1_arg(THD *thd, Item *arg1)
Create_func_to_seconds Create_func_to_seconds::s_singleton;
Item*
Create_func_to_seconds::create(THD *thd, Item *arg1)
Create_func_to_seconds::create_1_arg(THD *thd, Item *arg1)
{
return new (thd->mem_root) Item_func_to_seconds(arg1);
}