← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Stewart Smith
  • Date: 2008-12-16 23:22:36 UTC
  • mto: This revision was merged to the branch mainline in revision 711.
  • Revision ID: stewart@flamingspork.com-20081216232236-7zdqtm1dp2xwqr6a
remove global read_only (this should be the job of an auth plugin, not the kernel).

also remove now redundant tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
702
702
      return(1);
703
703
    }
704
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)