← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/start_transaction.cc

  • Committer: Stewart Smith
  • Date: 2011-03-29 01:30:47 UTC
  • mto: (2257.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: stewart@flamingspork.com-20110329013047-5ujzfx6pahmwuko2
https://launchpad.net/bugs/738022
have CachedDirectory print out a warning if we can't stat() something in a directory. We should always have access to at least stat() things in directories Drizzle is running in (otherwise there is likely a problem)

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>
 
25
#include <drizzled/session/transactions.h>
25
26
 
26
 
namespace drizzled
27
 
{
 
27
namespace drizzled {
28
28
 
29
29
bool statement::StartTransaction::execute()
30
30
{
31
 
  if (session->transaction.xid_state.xa_state != XA_NOTR)
 
31
  if (session().inTransaction())
 
32
  {
 
33
    push_warning_printf(&session(), DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
34
                        ER_TRANSACTION_ALREADY_STARTED,
 
35
                        ER(ER_TRANSACTION_ALREADY_STARTED));
 
36
    return false;
 
37
  }
 
38
 
 
39
  if (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[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 (! session().startTransaction(start_transaction_opt))
41
49
  {
42
50
    return true;
43
51
  }
44
 
  session->my_ok();
 
52
  session().my_ok();
45
53
  return false;
46
54
}
47
55