← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Joseph Daly
  • Date: 2010-10-25 03:07:47 UTC
  • mto: (1856.2.16 transaction_id_innodb)
  • mto: This revision was merged to the branch mainline in revision 1900.
  • Revision ID: skinny.moey@gmail.com-20101025030747-9buwdo8zal7b6ot9
working alter, drop, create schema

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
4118
4118
 
4119
4119
  error = row_insert_for_mysql((byte*) record, prebuilt);
4120
4120
 
 
4121
  user_session->setXaId((ib_uint64_t) ut_conv_dulint_to_longlong(trx->id));
 
4122
 
4121
4123
  /* Handle duplicate key errors */
4122
4124
  if (auto_inc_used) {
4123
4125
    ulint   err;
4435
4437
 
4436
4438
  error = row_update_for_mysql((byte*) old_row, prebuilt);
4437
4439
 
 
4440
  user_session->setXaId((ib_uint64_t) ut_conv_dulint_to_longlong(trx->id));
 
4441
 
4438
4442
  /* We need to do some special AUTOINC handling for the following case:
4439
4443
 
4440
4444
  INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
4525
4529
 
4526
4530
  error = row_update_for_mysql((byte*) record, prebuilt);
4527
4531
 
 
4532
  user_session->setXaId((ib_uint64_t) ut_conv_dulint_to_longlong(trx->id));
 
4533
 
4528
4534
  innodb_srv_conc_exit_innodb(trx);
4529
4535
 
4530
4536
  error = convert_error_code_to_mysql(
6052
6058
                                   session_sql_command(&session)
6053
6059
                                   == SQLCOM_DROP_DB);
6054
6060
 
 
6061
  session.setXaId((ib_uint64_t) ut_conv_dulint_to_longlong(trx->id));
 
6062
 
6055
6063
  /* Flush the log to reduce probability that the .frm files and
6056
6064
    the InnoDB data dictionary get out-of-sync if the user runs
6057
6065
    with innodb_flush_log_at_trx_commit = 0 */
6273
6281
 
6274
6282
  error = innobase_rename_table(trx, from.getPath().c_str(), to.getPath().c_str(), TRUE);
6275
6283
 
 
6284
  session.setXaId((ib_uint64_t) ut_conv_dulint_to_longlong(trx->id));
 
6285
 
6276
6286
  /* Tell the InnoDB server that there might be work for
6277
6287
    utility threads: */
6278
6288