← 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-11-19 02:33:17 UTC
  • mto: (1222.1.2 staging)
  • mto: This revision was merged to the branch mainline in revision 1224.
  • Revision ID: brian@gaz-20091119023317-lylyqkwhrewid34p
Remove a few more options, from options in HA_CREATE_INFO.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1458
1458
                                      message::Table *table_proto,
1459
1459
                                      AlterInfo *alter_info,
1460
1460
                                      List<Item> *items,
 
1461
                                      bool is_if_not_exists,
1461
1462
                                      DRIZZLE_LOCK **lock)
1462
1463
{
1463
1464
  Table tmp_table;              // Used during 'CreateField()'
1476
1477
      create_table->table->db_stat)
1477
1478
  {
1478
1479
    /* Table already exists and was open at openTablesLock() stage. */
1479
 
    if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
 
1480
    if (is_if_not_exists)
1480
1481
    {
1481
1482
      create_info->table_existed= 1;            // Mark that table existed
1482
1483
      push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
1537
1538
                                    create_info,
1538
1539
                                    table_proto,
1539
1540
                                    alter_info, false,
1540
 
                                    select_field_count))
 
1541
                                    select_field_count,
 
1542
                                    is_if_not_exists))
1541
1543
    {
1542
1544
      if (create_info->table_existed &&
1543
1545
          !(lex_identified_temp_table))
1637
1639
  if (!(table= create_table_from_items(session, create_info, create_table,
1638
1640
                                       table_proto,
1639
1641
                                       alter_info, &values,
 
1642
                                       is_if_not_exists,
1640
1643
                                       &extra_lock)))
1641
1644
    return(-1);                         // abort() deletes table
1642
1645