← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/release_savepoint.cc

  • Committer: Mark Atwood
  • Date: 2011-10-13 18:28:03 UTC
  • mfrom: (2433.1.5 rf1)
  • Revision ID: me@mark.atwood.name-20111013182803-pbmb3r5emfxfrbvy
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/release_savepoint.cc
46
46
  {
47
47
    NamedSavepoint &sv= *iter;
48
48
    const string &sv_name= sv.getName();
49
 
    if (my_strnncoll(system_charset_info,
50
 
                     (unsigned char *) lex().ident.str,
51
 
                     lex().ident.length,
52
 
                     (unsigned char *) sv_name.c_str(),
53
 
                     sv_name.size()) == 0)
 
49
    if (my_strnncoll(system_charset_info, (unsigned char *) lex().ident.data(), 
 
50
      lex().ident.size(), (unsigned char *) sv_name.c_str(), sv_name.size()) == 0)
54
51
      break;
55
52
  }
56
53
  if (iter != savepoints.end())
62
59
  }
63
60
  else
64
61
  {
65
 
    my_error(ER_SP_DOES_NOT_EXIST, 
66
 
             MYF(0), 
67
 
             "SAVEPOINT", 
68
 
             lex().ident.str);
 
62
    my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "SAVEPOINT", lex().ident.data());
69
63
  }
70
64
  return false;
71
65
}