← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/start_transaction.cc

  • Committer: Lee Bieber
  • Date: 2011-01-24 17:20:08 UTC
  • mfrom: (2107.2.1 trunk-bug-703913)
  • mto: This revision was merged to the branch mainline in revision 2109.
  • Revision ID: kalebral@gmail.com-20110124172008-y5maihyoyu7gn18p
Merge Andrew - fix bug 703913: some support-files should be dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/start_transaction.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/statement/start_transaction.h>
28
28
 
29
29
bool statement::StartTransaction::execute()
30
30
{
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
31
  if (getSession()->transaction.xid_state.xa_state != XA_NOTR)
40
32
  {
41
33
    my_error(ER_XAER_RMFAIL, MYF(0),