← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/savepoint.cc

  • Committer: Olaf van der Spek
  • Date: 2011-10-14 07:28:20 UTC
  • mfrom: (2436 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2438.
  • Revision ID: olafvdspek@gmail.com-20111014072820-nic6rljx3sg6bl9t
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/savepoint.cc
71
71
      NamedSavepoint &sv= *iter;
72
72
      const string &sv_name= sv.getName();
73
73
      if (my_strnncoll(system_charset_info,
74
 
                       (unsigned char *) lex().ident.str,
75
 
                       lex().ident.length,
 
74
                       (unsigned char *) lex().ident.data(),
 
75
                       lex().ident.size(),
76
76
                       (unsigned char *) sv_name.c_str(),
77
77
                       sv_name.size()) == 0)
78
78
        break;
84
84
      savepoints.erase(iter);
85
85
    }
86
86
    
87
 
    NamedSavepoint newsv(lex().ident.str, lex().ident.length);
 
87
    NamedSavepoint newsv(lex().ident.data(), lex().ident.size());
88
88
 
89
89
    if (TransactionServices::setSavepoint(session(), newsv))
90
90
    {