← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/item_create.cc

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/item_create.cc
380
380
};
381
381
 
382
382
 
383
 
class Create_func_convert_tz : public Create_func_arg3
384
 
{
385
 
public:
386
 
  virtual Item *create(THD *thd, Item *arg1, Item *arg2, Item *arg3);
387
 
 
388
 
  static Create_func_convert_tz s_singleton;
389
 
 
390
 
protected:
391
 
  Create_func_convert_tz() {}
392
 
  virtual ~Create_func_convert_tz() {}
393
 
};
394
 
 
395
 
 
396
383
class Create_func_cos : public Create_func_arg1
397
384
{
398
385
public:
1951
1938
}
1952
1939
 
1953
1940
 
1954
 
Create_func_convert_tz Create_func_convert_tz::s_singleton;
1955
 
 
1956
 
Item*
1957
 
Create_func_convert_tz::create(THD *thd, Item *arg1, Item *arg2, Item *arg3)
1958
 
{
1959
 
  return new (thd->mem_root) Item_func_convert_tz(arg1, arg2, arg3);
1960
 
}
1961
 
 
1962
 
 
1963
1941
Create_func_cos Create_func_cos::s_singleton;
1964
1942
 
1965
1943
Item*
3178
3156
  { { C_STRING_WITH_LEN("CONCAT_WS") }, BUILDER(Create_func_concat_ws)},
3179
3157
  { { C_STRING_WITH_LEN("CONNECTION_ID") }, BUILDER(Create_func_connection_id)},
3180
3158
  { { C_STRING_WITH_LEN("CONV") }, BUILDER(Create_func_conv)},
3181
 
  { { C_STRING_WITH_LEN("CONVERT_TZ") }, BUILDER(Create_func_convert_tz)},
3182
3159
  { { C_STRING_WITH_LEN("COS") }, BUILDER(Create_func_cos)},
3183
3160
  { { C_STRING_WITH_LEN("COT") }, BUILDER(Create_func_cot)},
3184
3161
  { { C_STRING_WITH_LEN("CRC32") }, BUILDER(Create_func_crc32)},