← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: devananda
  • Date: 2009-06-30 14:27:54 UTC
  • mfrom: (1030.2.4 trunk)
  • mto: (1093.1.7 captain)
  • mto: This revision was merged to the branch mainline in revision 1095.
  • Revision ID: devananda.vdv@gmail.com-20090630142754-vm9w374yxkf1pikc
merge from lp

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1448
1448
 
1449
1449
static Table *create_table_from_items(Session *session, HA_CREATE_INFO *create_info,
1450
1450
                                      TableList *create_table,
 
1451
                                      drizzled::message::Table *table_proto,
1451
1452
                                      Alter_info *alter_info,
1452
1453
                                      List<Item> *items,
1453
1454
                                      DRIZZLE_LOCK **lock)
1522
1523
    should not cause deadlocks or races.
1523
1524
  */
1524
1525
  {
1525
 
    drizzled::message::Table table_proto;
1526
 
    table_proto.set_name(create_table->table_name);
1527
 
    table_proto.set_type(drizzled::message::Table::STANDARD);
1528
 
 
1529
1526
    if (!mysql_create_table_no_lock(session, create_table->db,
1530
1527
                                    create_table->table_name,
1531
1528
                                    create_info,
1532
 
                                    &table_proto,
 
1529
                                    table_proto,
1533
1530
                                    alter_info, false,
1534
1531
                                    select_field_count))
1535
1532
    {
1627
1624
  */
1628
1625
 
1629
1626
  if (!(table= create_table_from_items(session, create_info, create_table,
 
1627
                                       table_proto,
1630
1628
                                       alter_info, &values,
1631
1629
                                       &extra_lock)))
1632
1630
    return(-1);                         // abort() deletes table