← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Monty Taylor
  • Date: 2008-10-13 09:29:43 UTC
  • mfrom: (509 drizzle)
  • mto: (509.1.4 codestyle)
  • mto: This revision was merged to the branch mainline in revision 511.
  • Revision ID: monty@inaugust.com-20081013092943-rwvx4a6d85b5l2dh
Merged in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
279
279
  }
280
280
  lock_type= table_list->lock_type;
281
281
 
282
 
  thd_proc_info(thd, "init");
 
282
  thd->set_proc_info("init");
283
283
  thd->used_tables=0;
284
284
  values= its++;
285
285
  value_count= values->elements;
358
358
    goto abort;
359
359
 
360
360
  error=0;
361
 
  thd_proc_info(thd, "update");
 
361
  thd->set_proc_info("update");
362
362
  if (duplic == DUP_REPLACE)
363
363
    table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE);
364
364
  if (duplic == DUP_UPDATE)
504
504
                thd->transaction.stmt.modified_non_trans_table);
505
505
 
506
506
  }
507
 
  thd_proc_info(thd, "end");
 
507
  thd->set_proc_info("end");
508
508
  /*
509
509
    We'll report to the client this id:
510
510
    - if the table contains an autoincrement column and we successfully
1649
1649
    if (!mysql_create_table_no_lock(thd, create_table->db,
1650
1650
                                    create_table->table_name,
1651
1651
                                    create_info, alter_info, 0,
1652
 
                                    select_field_count))
 
1652
                                    select_field_count, true))
1653
1653
    {
1654
1654
      if (create_info->table_existed &&
1655
1655
          !(create_info->options & HA_LEX_CREATE_TMP_TABLE))