← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1516
1516
    alter_info->create_list.push_back(cr_field);
1517
1517
  }
1518
1518
 
 
1519
  TableIdentifier identifier(create_table->db,
 
1520
                             create_table->table_name,
 
1521
                             lex_identified_temp_table ?  NON_TRANSACTIONAL_TMP_TABLE :
 
1522
                             NO_TMP_TABLE);
 
1523
 
 
1524
 
1519
1525
  /*
1520
1526
    Create and lock table.
1521
1527
 
1524
1530
    should not cause deadlocks or races.
1525
1531
  */
1526
1532
  {
1527
 
    if (!mysql_create_table_no_lock(session, create_table->db,
1528
 
                                    create_table->table_name,
 
1533
    if (!mysql_create_table_no_lock(session,
 
1534
                                    identifier,
1529
1535
                                    create_info,
1530
1536
                                    table_proto,
1531
 
                                    alter_info, false,
 
1537
                                    alter_info,
 
1538
                                    false,
1532
1539
                                    select_field_count,
1533
1540
                                    is_if_not_exists))
1534
1541
    {