← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

  • Committer: Brian Aker
  • Date: 2009-12-01 23:52:10 UTC
  • mfrom: (1235.1.4 push)
  • Revision ID: brian@gaz-20091201235210-rb720ykhz8e06fda
Merge Brian + Monty. This has the HEAP -> MEMORY change in it, so some
breakage for wrong table name is expected.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
526
526
  {
527
527
    Table *t= table_ptr[i];
528
528
 
529
 
    if (t->s->tmp_table != NON_TRANSACTIONAL_TMP_TABLE)
 
529
    if (! (t->getEngine()->check_flag(HTON_BIT_SKIP_STORE_LOCK)))
530
530
    {
531
531
      tables++;
532
532
      lock_count++;
553
553
    Table *table;
554
554
    enum thr_lock_type lock_type;
555
555
 
556
 
    if (table_ptr[i]->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
 
556
    if (table_ptr[i]->getEngine()->check_flag(HTON_BIT_SKIP_STORE_LOCK))
557
557
      continue;
 
558
 
558
559
    table= table_ptr[i];
559
560
    lock_type= table->reginfo.lock_type;
560
561
    assert (lock_type != TL_WRITE_DEFAULT);