← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Stewart Smith
  • Date: 2010-03-17 22:56:12 UTC
  • mfrom: (1283.31.1)
  • mto: (1283.38.1)
  • mto: This revision was merged to the branch mainline in revision 1475.
  • Revision ID: stewart@flamingspork.com-20100317225612-42m9qv1zjyycpi9f
Merged embedded-innodb-config-table-function into embedded-innodb-status-table-function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1458
1458
                                      AlterInfo *alter_info,
1459
1459
                                      List<Item> *items,
1460
1460
                                      bool is_if_not_exists,
1461
 
                                      DRIZZLE_LOCK **lock)
 
1461
                                      DRIZZLE_LOCK **lock,
 
1462
                                      TableIdentifier &identifier)
1462
1463
{
1463
1464
  Table tmp_table;              // Used during 'CreateField()'
1464
1465
  TableShare share;
1527
1528
    alter_info->create_list.push_back(cr_field);
1528
1529
  }
1529
1530
 
1530
 
  TableIdentifier identifier(create_table->db,
1531
 
                             create_table->table_name,
1532
 
                             lex_identified_temp_table ?  TEMP_TABLE :
1533
 
                             STANDARD_TABLE);
1534
 
 
1535
 
 
1536
1531
  /*
1537
1532
    Create and lock table.
1538
1533
 
1542
1537
  */
1543
1538
  {
1544
1539
    if (not mysql_create_table_no_lock(session,
1545
 
                                    identifier,
1546
 
                                    create_info,
1547
 
                                    table_proto,
1548
 
                                    alter_info,
1549
 
                                    false,
1550
 
                                    select_field_count,
1551
 
                                    is_if_not_exists))
 
1540
                                       identifier,
 
1541
                                       create_info,
 
1542
                                       table_proto,
 
1543
                                       alter_info,
 
1544
                                       false,
 
1545
                                       select_field_count,
 
1546
                                       is_if_not_exists))
1552
1547
    {
1553
1548
      if (create_info->table_existed &&
1554
1549
          !(lex_identified_temp_table))
1629
1624
 
1630
1625
  unit= u;
1631
1626
 
1632
 
  if (!(table= create_table_from_items(session, create_info, create_table,
1633
 
                                       table_proto,
1634
 
                                       alter_info, &values,
1635
 
                                       is_if_not_exists,
1636
 
                                       &extra_lock)))
 
1627
  if (not (table= create_table_from_items(session, create_info, create_table,
 
1628
                                          table_proto,
 
1629
                                          alter_info, &values,
 
1630
                                          is_if_not_exists,
 
1631
                                          &extra_lock, identifier)))
1637
1632
    return(-1);                         // abort() deletes table
1638
1633
 
1639
1634
  if (extra_lock)