~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

Committer: Lee
Date: 2008-12-17 04:13:48 UTC
mfrom: (712 testable)
mto: (754.1.1 devel) (758.1.3 devel)
mto: This revision was merged to the branch mainline in revision 725.
Revision ID: lbieber@lbieber-desktop-20081217041348-vcel3ztg6z6nj24u

merge with latest from the trunk

files removed:
tests/suite/broken/r/locktrans_innodb.result

tests/suite/broken/r/locktrans_myisam.result

tests/suite/broken/r/read_only.result

tests/suite/broken/r/read_only_innodb.result

tests/suite/broken/t/locktrans_innodb-master.opt

tests/suite/broken/t/locktrans_innodb.test

tests/suite/broken/t/locktrans_myisam-master.opt

tests/suite/broken/t/locktrans_myisam.test

tests/suite/broken/t/read_only.test

tests/suite/broken/t/read_only_innodb.test

files renamed:
tests/suite/broken/r/explain.result => tests/r/explain.result

tests/suite/broken/t/explain.test => tests/t/explain.test

files modified:
drizzled/drizzled.cc

drizzled/handler.cc

drizzled/lock.cc

drizzled/lock.h

drizzled/set_var.cc

drizzled/set_var.h

drizzled/sql_parse.cc

drizzled/sql_yacc.yy

Show diffs side-by-side

added added

removed removed

drizzled/handler.cc

702

return(1);

703

}

704

705

if ( is_real_trans

706

&& opt_readonly

707

&& ! session->slave_thread

708

)

709

{

710

my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only");

711

ha_rollback_trans(session, all);

712

error= 1;

713

goto end;

714

}

715

716

705

must_2pc= ha_check_and_coalesce_trx_read_only(session, ha_info, all);

717

706

718

707

if (!trans->no_2pc && must_2pc)

Older »