← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/rollback_to_savepoint.cc

updating

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/rollback_to_savepoint.cc
41
41
   * starts the transaction. Table affecting statements do this work in
42
42
   * lockTables() by calling startStatement().
43
43
   */
44
 
  if ( (getSession()->options & OPTION_NOT_AUTOCOMMIT) &&
 
44
  if ( (session().options & OPTION_NOT_AUTOCOMMIT) &&
45
45
       (transaction().all.getResourceContexts().empty() == true) )
46
46
  {
47
 
    if (getSession()->startTransaction() == false)
 
47
    if (session().startTransaction() == false)
48
48
    {
49
49
      return false;
50
50
    }
88
88
                     first_savepoint_name.size()) == 0)
89
89
    {
90
90
      /* Found the named savepoint we want to rollback to */
91
 
      (void) transaction_services.rollbackToSavepoint(*getSession(), first_savepoint);
 
91
      (void) transaction_services.rollbackToSavepoint(session(), first_savepoint);
92
92
 
93
93
      if (transaction().all.hasModifiedNonTransData())
94
94
      {
95
 
        push_warning(getSession(), 
 
95
        push_warning(&session(), 
96
96
                     DRIZZLE_ERROR::WARN_LEVEL_WARN,
97
97
                     ER_WARNING_NOT_COMPLETE_ROLLBACK,
98
98
                     ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));
99
99
      }
100
 
      getSession()->my_ok();
 
100
      session().my_ok();
101
101
      return false;
102
102
    }
103
103
  }
126
126
      /* Found the named savepoint we want to rollback to */
127
127
      found= true;
128
128
 
129
 
      (void) transaction_services.rollbackToSavepoint(*getSession(), sv);
 
129
      (void) transaction_services.rollbackToSavepoint(session(), sv);
130
130
    }
131
131
    if (found)
132
132
    {
143
143
  {
144
144
    if (transaction().all.hasModifiedNonTransData())
145
145
    {
146
 
      push_warning(getSession(), 
 
146
      push_warning(&session(), 
147
147
                   DRIZZLE_ERROR::WARN_LEVEL_WARN,
148
148
                   ER_WARNING_NOT_COMPLETE_ROLLBACK,
149
149
                   ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));
150
150
    }
151
151
    /* Store new savepoints list */
152
152
    transaction().savepoints= new_savepoints;
153
 
    getSession()->my_ok();
 
153
    session().my_ok();
154
154
  }
155
155
  else
156
156
  {