← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/start_transaction.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/start_transaction.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems
 
4
 *  Copyright (C) 2009 Sun Microsystems, Inc.
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
28
28
 
29
29
bool statement::StartTransaction::execute()
30
30
{
31
 
  if (session->transaction.xid_state.xa_state != XA_NOTR)
 
31
  if (getSession()->inTransaction())
 
32
  {
 
33
    push_warning_printf(getSession(), DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
34
                        ER_TRANSACTION_ALREADY_STARTED,
 
35
                        ER(ER_TRANSACTION_ALREADY_STARTED));
 
36
    return false;
 
37
  }
 
38
 
 
39
  if (getSession()->transaction.xid_state.xa_state != XA_NOTR)
32
40
  {
33
41
    my_error(ER_XAER_RMFAIL, MYF(0),
34
 
        xa_state_names[session->transaction.xid_state.xa_state]);
 
42
        xa_state_names[getSession()->transaction.xid_state.xa_state]);
35
43
    return false;
36
44
  }
37
45
  /*
38
46
     Breakpoints for backup testing.
39
47
   */
40
 
  if (! session->startTransaction(start_transaction_opt))
 
48
  if (! getSession()->startTransaction(start_transaction_opt))
41
49
  {
42
50
    return true;
43
51
  }
44
 
  session->my_ok();
 
52
  getSession()->my_ok();
45
53
  return false;
46
54
}
47
55