← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

  • Committer: Monty Taylor
  • Date: 2010-05-21 06:34:45 UTC
  • mfrom: (1530.2.8)
  • mto: (1530.5.7)
  • mto: This revision was merged to the branch mainline in revision 1560.
  • Revision ID: mordred@inaugust.com-20100521063445-8isexfjpicuqhf5a
Merged fix-lcov-failure into new-valgrind-suppressions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
709
709
 
710
710
      if (table->in_use == session)
711
711
      {
712
 
        table->s->version= 0;                  // Ensure no one can use this
713
 
        table->locked_by_name= 1;
 
712
        table->getMutableShare()->version= 0;                  // Ensure no one can use this
 
713
        table->locked_by_name= true;
714
714
        return 0;
715
715
      }
716
716
    }
717
717
  }
718
718
 
719
719
  if (!(table= session->table_cache_insert_placeholder(key, key_length)))
 
720
  {
720
721
    return -1;
 
722
  }
721
723
 
722
724
  table_list->table=table;
723
725