← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2010-12-27 19:18:58 UTC
  • mfrom: (2035 staging)
  • mto: (2035.1.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2037.
  • Revision ID: brian@tangent.org-20101227191858-h11rg8ncrkiklg3f
Manage merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
669
669
  /*
670
670
    Note that we need to hold table::Cache::singleton().mutex() while changing the
671
671
    open_tables list. Another thread may work on it.
672
 
    (See: table::Cache::singleton().removeTable(), mysql_wait_completed_table())
 
672
    (See: table::Cache::singleton().removeTable(), wait_completed_table())
673
673
    Closing a MERGE child before the parent would be fatal if the
674
674
    other thread tries to abort the MERGE lock in between.
675
675
  */
1504
1504
  /*
1505
1505
    Note that we need to hold table::Cache::singleton().mutex() while changing the
1506
1506
    open_tables list. Another thread may work on it.
1507
 
    (See: table::Cache::singleton().removeTable(), mysql_wait_completed_table())
 
1507
    (See: table::Cache::singleton().removeTable(), wait_completed_table())
1508
1508
    Closing a MERGE child before the parent would be fatal if the
1509
1509
    other thread tries to abort the MERGE lock in between.
1510
1510
  */