← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Mark Atwood
  • Date: 2011-05-03 06:15:46 UTC
  • mfrom: (2280.1.10 prune3)
  • Revision ID: me@mark.atwood.name-20110503061546-1anpohbzcy1tzmc7
merge lp:~olafvdspek/drizzle/prune3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1855
1855
    other thread tries to abort the MERGE lock in between.
1856
1856
  */
1857
1857
  if (open_tables.open_tables_)
1858
 
    close_open_tables();
 
1858
    open_tables.close_open_tables();
1859
1859
}
1860
1860
 
1861
1861
void Session::close_tables_for_reopen(TableList **tables)