← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/savepoint.cc

  • Committer: Brian Aker
  • Date: 2011-02-11 09:39:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2160.
  • Revision ID: brian@tangent.org-20110211093917-qfdydch1fzskruf8
Fix for union.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/savepoint.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
22
 
#include <drizzled/show.h>
23
 
#include <drizzled/session.h>
24
 
#include <drizzled/statement/savepoint.h>
25
 
#include <drizzled/transaction_services.h>
26
 
#include <drizzled/named_savepoint.h>
 
21
#include "config.h"
 
22
#include "drizzled/show.h"
 
23
#include "drizzled/session.h"
 
24
#include "drizzled/statement/savepoint.h"
 
25
#include "drizzled/transaction_services.h"
 
26
#include "drizzled/named_savepoint.h"
27
27
 
28
28
#include <string>
29
29
#include <deque>
72
72
      NamedSavepoint &sv= *iter;
73
73
      const string &sv_name= sv.getName();
74
74
      if (my_strnncoll(system_charset_info,
75
 
                       (unsigned char *) getSession()->getLex()->ident.str,
76
 
                       getSession()->getLex()->ident.length,
 
75
                       (unsigned char *) getSession()->lex->ident.str,
 
76
                       getSession()->lex->ident.length,
77
77
                       (unsigned char *) sv_name.c_str(),
78
78
                       sv_name.size()) == 0)
79
79
        break;
85
85
      savepoints.erase(iter);
86
86
    }
87
87
    
88
 
    NamedSavepoint newsv(getSession()->getLex()->ident.str, getSession()->getLex()->ident.length);
 
88
    NamedSavepoint newsv(getSession()->lex->ident.str, getSession()->lex->ident.length);
89
89
 
90
90
    if (transaction_services.setSavepoint(*getSession(), newsv))
91
91
    {