← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Monty Taylor
  • Date: 2011-04-06 21:23:45 UTC
  • mfrom: (2268.1.4 build)
  • Revision ID: mordred@inaugust.com-20110406212345-a7w7nkcuq60ybi4z
Merge Monty: Windows Fixes
Merge Olaf: open_table refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1625
1625
            it preparable for open. But let us do close_temporary_table() here
1626
1626
            just in case.
1627
1627
          */
1628
 
          session->drop_temporary_table(identifier);
 
1628
          session->open_tables.drop_temporary_table(identifier);
1629
1629
        }
1630
1630
      }
1631
1631
    }
1684
1684
    if (identifier.isTmp())
1685
1685
      m_plock= &m_lock;
1686
1686
    else
1687
 
      m_plock= &session->extra_lock;
 
1687
      m_plock= &session->open_tables.extra_lock;
1688
1688
 
1689
1689
    *m_plock= extra_lock;
1690
1690
  }