~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/start_transaction.cc

  • Committer: lbieber
  • Date: 2010-10-02 19:48:35 UTC
  • mfrom: (1730.6.19 drizzle-make-lcov)
  • Revision ID: lbieber@orisndriz08-20101002194835-q5zd9qc4lvx1xnfo
Merge Hartmut - clean up lex, now require flex to build, also "make lcov" improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
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, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
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 (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)
 
31
  if (session->transaction.xid_state.xa_state != XA_NOTR)
40
32
  {
41
33
    my_error(ER_XAER_RMFAIL, MYF(0),
42
 
        xa_state_names[getSession()->transaction.xid_state.xa_state]);
 
34
        xa_state_names[session->transaction.xid_state.xa_state]);
43
35
    return false;
44
36
  }
45
37
  /*
46
38
     Breakpoints for backup testing.
47
39
   */
48
 
  if (! getSession()->startTransaction(start_transaction_opt))
 
40
  if (! session->startTransaction(start_transaction_opt))
49
41
  {
50
42
    return true;
51
43
  }
52
 
  getSession()->my_ok();
 
44
  session->my_ok();
53
45
  return false;
54
46
}
55
47