← 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: 2009-12-01 23:52:10 UTC
  • mfrom: (1235.1.4 push)
  • Revision ID: brian@gaz-20091201235210-rb720ykhz8e06fda
Merge Brian + Monty. This has the HEAP -> MEMORY change in it, so some
breakage for wrong table name is expected.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1518
1518
 
1519
1519
  TableIdentifier identifier(create_table->db,
1520
1520
                             create_table->table_name,
1521
 
                             lex_identified_temp_table ?  NON_TRANSACTIONAL_TMP_TABLE :
 
1521
                             lex_identified_temp_table ?  TEMP_TABLE :
1522
1522
                             NO_TMP_TABLE);
1523
1523
 
1524
1524
 
1556
1556
        pthread_mutex_lock(&LOCK_open); /* CREATE TABLE... has found that the table already exists for insert and is adapting to use it */
1557
1557
        if (session->reopen_name_locked_table(create_table, false))
1558
1558
        {
1559
 
          quick_rm_table(*session, create_table->db,
1560
 
                         create_table->table_name, false);
 
1559
          quick_rm_table(*session, identifier);
1561
1560
        }
1562
1561
        else
1563
1562
          table= create_table->table;