← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Lee Bieber
  • Date: 2011-02-10 01:09:23 UTC
  • mfrom: (2152.2.1 alter-table)
  • Revision ID: kalebral@gmail.com-20110210010923-mbwuwow0nudk7ryh
Merge Brian - more parser rework

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
492
492
                                    !session->cuted_fields))
493
493
  {
494
494
    session->row_count_func= info.copied + info.deleted + info.updated;
495
 
    session->my_ok((ulong) session->row_count_func,
 
495
    session->my_ok((ulong) session->rowCount(),
496
496
                   info.copied + info.deleted + info.touched, id);
497
497
  }
498
498
  else
505
505
      snprintf(buff, sizeof(buff), ER(ER_INSERT_INFO), (ulong) info.records,
506
506
              (ulong) (info.deleted + info.updated), (ulong) session->cuted_fields);
507
507
    session->row_count_func= info.copied + info.deleted + info.updated;
508
 
    session->my_ok((ulong) session->row_count_func,
 
508
    session->my_ok((ulong) session->rowCount(),
509
509
                   info.copied + info.deleted + info.touched, id, buff);
510
510
  }
511
 
  session->status_var.inserted_row_count+= session->row_count_func;
 
511
  session->status_var.inserted_row_count+= session->rowCount();
512
512
  session->setAbortOnWarning(false);
513
 
  DRIZZLE_INSERT_DONE(0, session->row_count_func);
 
513
  DRIZZLE_INSERT_DONE(0, session->rowCount());
514
514
 
515
515
  return false;
516
516
}
1382
1382
    (session->arg_of_last_insert_id_function ?
1383
1383
     session->first_successful_insert_id_in_prev_stmt :
1384
1384
     (info.copied ? autoinc_value_of_last_inserted_row : 0));
1385
 
  session->my_ok((ulong) session->row_count_func,
 
1385
  session->my_ok((ulong) session->rowCount(),
1386
1386
                 info.copied + info.deleted + info.touched, id, buff);
1387
 
  session->status_var.inserted_row_count+= session->row_count_func; 
1388
 
  DRIZZLE_INSERT_SELECT_DONE(0, session->row_count_func);
 
1387
  session->status_var.inserted_row_count+= session->rowCount(); 
 
1388
  DRIZZLE_INSERT_SELECT_DONE(0, session->rowCount());
1389
1389
  return 0;
1390
1390
}
1391
1391