← 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: 2010-10-24 19:36:55 UTC
  • mfrom: (1876 merge)
  • mto: This revision was merged to the branch mainline in revision 1877.
  • Revision ID: brian@tangent.org-20101024193655-vmussroka6v0u1v6
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
682
682
 
683
683
static int lock_table_name(Session *session, TableList *table_list)
684
684
{
685
 
  TableIdentifier identifier(table_list->db, table_list->table_name);
 
685
  TableIdentifier identifier(table_list->getSchemaName(), table_list->getTableName());
686
686
  const TableIdentifier::Key &key(identifier.getKey());
687
687
 
688
688
  {