← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Brian Aker
  • Date: 2010-10-24 19:39:04 UTC
  • mfrom: (1874.3.4 refactor)
  • Revision ID: brian@tangent.org-20101024193904-6c5a62rtd14bx9q4
Merge for "how do we make sure concurrent, are only concurrent"

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1600
1600
      if (not identifier.isTmp())
1601
1601
      {
1602
1602
        LOCK_open.lock(); /* CREATE TABLE... has found that the table already exists for insert and is adapting to use it */
1603
 
        if (session->reopen_name_locked_table(create_table))
 
1603
 
 
1604
        if (create_table->table)
 
1605
        {
 
1606
          table::Concurrent *concurrent_table= dynamic_cast<table::Concurrent *>(create_table->table);
 
1607
 
 
1608
          if (concurrent_table->reopen_name_locked_table(create_table, session))
 
1609
          {
 
1610
            quick_rm_table(*session, identifier);
 
1611
          }
 
1612
          else
 
1613
          {
 
1614
            table= create_table->table;
 
1615
          }
 
1616
        }
 
1617
        else
1604
1618
        {
1605
1619
          quick_rm_table(*session, identifier);
1606
1620
        }
1607
 
        else
1608
 
        {
1609
 
          table= create_table->table;
1610
 
        }
 
1621
 
1611
1622
        LOCK_open.unlock();
1612
1623
      }
1613
1624
      else