← 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-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/release_savepoint.cc
39
39
   * find one with the same name, we release it and
40
40
   * unbind it from our deque.
41
41
   */
42
 
  TransactionServices &transaction_services= TransactionServices::singleton();
43
42
  deque<NamedSavepoint> &savepoints= transaction().savepoints;
44
43
  deque<NamedSavepoint>::iterator iter;
45
44
 
46
 
  for (iter= savepoints.begin();
47
 
       iter != savepoints.end();
48
 
       ++iter)
 
45
  for (iter= savepoints.begin(); iter != savepoints.end(); ++iter)
49
46
  {
50
47
    NamedSavepoint &sv= *iter;
51
48
    const string &sv_name= sv.getName();
59
56
  if (iter != savepoints.end())
60
57
  {
61
58
    NamedSavepoint &sv= *iter;
62
 
    (void) transaction_services.releaseSavepoint(session(), sv);
 
59
    (void) TransactionServices::releaseSavepoint(session(), sv);
63
60
    savepoints.erase(iter);
64
61
    session().my_ok();
65
62
  }