← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/definition/table.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 21:03:52 UTC
  • mto: (1921.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1917.
  • Revision ID: brian@tangent.org-20101108210352-vthbzdksgrcj4nax
Remove a bunch of dead code from within table share.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/definition/table.cc
444
444
  errarg(0),
445
445
  blob_ptr_size(0),
446
446
  db_low_byte_first(false),
447
 
  name_lock(false),
448
 
  replace_with_name_lock(false),
449
 
  waiting_on_cond(false),
450
447
  keys_in_use(0),
451
448
  keys_for_keyread(0),
452
449
  event_observers(NULL)
513
510
  errarg(0),
514
511
  blob_ptr_size(0),
515
512
  db_low_byte_first(false),
516
 
  name_lock(false),
517
 
  replace_with_name_lock(false),
518
 
  waiting_on_cond(false),
519
513
  keys_in_use(0),
520
514
  keys_for_keyread(0),
521
515
  event_observers(NULL)
588
582
  errarg(0),
589
583
  blob_ptr_size(0),
590
584
  db_low_byte_first(false),
591
 
  name_lock(false),
592
 
  replace_with_name_lock(false),
593
 
  waiting_on_cond(false),
594
585
  keys_in_use(0),
595
586
  keys_for_keyread(0),
596
587
  event_observers(NULL)
670
661
  errarg(0),
671
662
  blob_ptr_size(0),
672
663
  db_low_byte_first(false),
673
 
  name_lock(false),
674
 
  replace_with_name_lock(false),
675
 
  waiting_on_cond(false),
676
664
  keys_in_use(0),
677
665
  keys_for_keyread(0),
678
666
  event_observers(NULL)
744
732
  */
745
733
  if (tmp_table == message::Table::STANDARD)
746
734
  {
747
 
    /* share->mutex is locked in release_table_share() */
748
 
    while (waiting_on_cond)
749
 
    {
750
 
      cond.notify_all();
751
 
      boost::mutex::scoped_lock scoped(mutex, boost::adopt_lock_t());
752
 
      cond.wait(scoped);
753
 
      scoped.release();
754
 
    }
755
735
    /* No thread refers to this anymore */
756
736
    mutex.unlock();
757
737
  }