← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/functions.h

  • Committer: Stewart Smith
  • Author(s): Marko Mäkelä, Stewart Smith
  • Date: 2010-12-06 04:20:58 UTC
  • mto: (2021.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1986.
  • Revision ID: stewart@flamingspork.com-20101206042058-kgr10dbz5jut838t
Merge Revision revid:marko.makela@oracle.com-20100909112752-ac5w7zyzbv10nvi1 from MySQL InnoDB

Original revid:marko.makela@oracle.com-20100909112752-ac5w7zyzbv10nvi1

Original Authors: Marko Mkel <marko.makela@oracle.com>
Original commit message:
Remove ut0auxconf.h.
It was needed when InnoDB Plugin was distributed independently of MySQL.
Approved by Vasil Dimov.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/functions.h
21
21
#ifndef DRIZZLED_GENERATOR_FUNCTIONS_H
22
22
#define DRIZZLED_GENERATOR_FUNCTIONS_H
23
23
 
24
 
#include <drizzled/plugin/function.h>
25
 
 
26
 
#include <drizzled/visibility.h>
 
24
#include "drizzled/plugin/function.h"
27
25
 
28
26
namespace drizzled {
29
27
namespace generator {
30
28
 
31
 
class DRIZZLED_API Functions
 
29
class Functions
32
30
{
33
31
  Session &session;
34
 
  typedef std::vector <std::string> vector;
35
32
  std::string function_name;
36
 
  vector function_list;
37
 
  vector::iterator iter;
 
33
  plugin::Function::UdfMap::const_iterator udf_iter;
38
34
 
39
35
public:
40
36
 
42
38
 
43
39
  operator std::string*()
44
40
  {
45
 
    if (iter == function_list.end())
 
41
    if (udf_iter == plugin::Function::getMap().end())
46
42
      return NULL;
47
43
 
48
 
    function_name= *iter;
49
 
    iter++;
 
44
    function_name= (*udf_iter).first;
 
45
    udf_iter++;
50
46
 
51
47
    return &function_name;
52
48
  }