← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/string_functions/regex.cc

  • Committer: Lee Bieber
  • Date: 2010-12-14 19:12:01 UTC
  • mfrom: (1994.2.2 build)
  • Revision ID: kalebral@gmail.com-20101214191201-h090vcfefa97eiv9
Merge Stewart - fix bug 655805 - HailDB Cursor not resetting this->cursor to clustered index after secondary index operations
Merge Andrew - fix bug 690083: Wrong results with regular expressions

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/string_functions/regex.cc
35
35
  if (re.empty())
36
36
  {
37
37
    drizzled::String _regex;
38
 
    drizzled::String *regex= args[0]->val_str(&_regex);
 
38
    drizzled::String *regex= args[1]->val_str(&_regex);
39
39
 
40
40
    if (not regex or not regex->length() or not res or not res->length())
41
41
    {
43
43
      return false;
44
44
    }
45
45
 
46
 
    re.assign(res->c_str());
 
46
    re.assign(regex->c_str());
47
47
  }
48
48
 
49
49
  if (not res or not res->length())