← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/rollback_to_savepoint.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/rollback_to_savepoint.cc
73
73
    my_error(ER_SP_DOES_NOT_EXIST, 
74
74
             MYF(0), 
75
75
             "SAVEPOINT", 
76
 
             getSession()->lex->ident.str);
 
76
             getSession()->getLex()->ident.str);
77
77
    return false;
78
78
  }
79
79
 
82
82
    NamedSavepoint &first_savepoint= savepoints.front();
83
83
    const string &first_savepoint_name= first_savepoint.getName();
84
84
    if (my_strnncoll(system_charset_info,
85
 
                     (unsigned char *) getSession()->lex->ident.str, 
86
 
                     getSession()->lex->ident.length,
 
85
                     (unsigned char *) getSession()->getLex()->ident.str, 
 
86
                     getSession()->getLex()->ident.length,
87
87
                     (unsigned char *) first_savepoint_name.c_str(), 
88
88
                     first_savepoint_name.size()) == 0)
89
89
    {
118
118
    const string &sv_name= sv.getName();
119
119
    if (! found && 
120
120
        my_strnncoll(system_charset_info,
121
 
                     (unsigned char *) getSession()->lex->ident.str, 
122
 
                     getSession()->lex->ident.length,
 
121
                     (unsigned char *) getSession()->getLex()->ident.str, 
 
122
                     getSession()->getLex()->ident.length,
123
123
                     (unsigned char *) sv_name.c_str(), 
124
124
                     sv_name.size()) == 0)
125
125
    {
159
159
    my_error(ER_SP_DOES_NOT_EXIST, 
160
160
             MYF(0), 
161
161
             "SAVEPOINT", 
162
 
             getSession()->lex->ident.str);
 
162
             getSession()->getLex()->ident.str);
163
163
  }
164
164
  return false;
165
165
}