← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/create.cc

Merge Devananda's BENCHMARK UDF plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/create.cc
69
69
#include <drizzled/function/additive_op.h>
70
70
#include <drizzled/function/math/asin.h>
71
71
#include <drizzled/function/math/atan.h>
72
 
#include <drizzled/function/benchmark.h>
73
72
#include <drizzled/function/math/ceiling.h>
74
73
#include <drizzled/function/coercibility.h>
75
74
#include <drizzled/function/math/cos.h>
319
318
  virtual ~Create_func_atan() {}
320
319
};
321
320
 
322
 
 
323
 
class Create_func_benchmark : public Create_func_arg2
324
 
{
325
 
public:
326
 
  using Create_func_arg2::create;
327
 
 
328
 
  virtual Item *create(Session *session, Item *arg1, Item *arg2);
329
 
 
330
 
  static Create_func_benchmark s_singleton;
331
 
 
332
 
protected:
333
 
  Create_func_benchmark() {}
334
 
  virtual ~Create_func_benchmark() {}
335
 
};
336
 
 
337
 
 
338
321
class Create_func_bin : public Create_func_arg1
339
322
{
340
323
public:
1699
1682
  return func;
1700
1683
}
1701
1684
 
1702
 
 
1703
 
Create_func_benchmark Create_func_benchmark::s_singleton;
1704
 
 
1705
 
Item*
1706
 
Create_func_benchmark::create(Session *session, Item *arg1, Item *arg2)
1707
 
{
1708
 
  return new (session->mem_root) Item_func_benchmark(arg1, arg2);
1709
 
}
1710
 
 
1711
 
 
1712
1685
Create_func_bin Create_func_bin::s_singleton;
1713
1686
 
1714
1687
Item*
2749
2722
  { { C_STRING_WITH_LEN("ASIN") }, BUILDER(Create_func_asin)},
2750
2723
  { { C_STRING_WITH_LEN("ATAN") }, BUILDER(Create_func_atan)},
2751
2724
  { { C_STRING_WITH_LEN("ATAN2") }, BUILDER(Create_func_atan)},
2752
 
  { { C_STRING_WITH_LEN("BENCHMARK") }, BUILDER(Create_func_benchmark)},
2753
2725
  { { C_STRING_WITH_LEN("BIN") }, BUILDER(Create_func_bin)},
2754
2726
  { { C_STRING_WITH_LEN("CEIL") }, BUILDER(Create_func_ceiling)},
2755
2727
  { { C_STRING_WITH_LEN("CEILING") }, BUILDER(Create_func_ceiling)},