← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/string_functions/regex.h

  • Committer: Lee Bieber
  • Date: 2010-12-15 16:23:36 UTC
  • mfrom: (1995.1.2 build)
  • Revision ID: kalebral@gmail.com-20101215162336-juntyt4gw4vgohg4
Merge Andrew - fix bug 628912: Crash / segfault in drizzled::Item_func::arguments (this=0x35) at ./drizzled/function/func.h
Merge Andrew - 663919: next query after KILL QUERY will error

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/string_functions/regex.h
21
21
#ifndef PLUGIN_STRING_FUNCTIONS_REGEX_H
22
22
#define PLUGIN_STRING_FUNCTIONS_REGEX_H
23
23
 
24
 
#include <drizzled/item/function/boolean.h>
 
24
#include <drizzled/item/cmpfunc.h>
25
25
#include <boost/regex.hpp>
26
26
 
27
27
namespace drizzled
29
29
namespace string_functions
30
30
{
31
31
 
32
 
class Regex :public drizzled::item::function::Boolean
 
32
class Regex :public Item_bool_func
33
33
{
34
34
  bool is_negative;
35
35
  boost::regex re;