~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Lee Bieber
  • Date: 2010-12-09 19:40:05 UTC
  • mfrom: (1991.1.2 build)
  • Revision ID: kalebral@gmail.com-20101209194005-hpxailmc9afmvelh
Remove disabling of drizzleslap test
Merge Shrews - fix bug 683147: Large row affecting statements failing mid-transaction may not get undone properly by TransactionServices if part of multi-message Transaction

Show diffs side-by-side

added added

removed removed

Lines of Context:
1275
1275
  store_values(values);
1276
1276
  session->count_cuted_fields= CHECK_FIELD_IGNORE;
1277
1277
  if (session->is_error())
1278
 
  {
1279
 
    /*
1280
 
     * If we fail mid-way through INSERT..SELECT, we need to remove any
1281
 
     * records that we added to the current Statement message. We can
1282
 
     * use session->row_count to know how many records we have already added.
1283
 
     */
1284
 
    TransactionServices &ts= TransactionServices::singleton();
1285
 
    ts.removeStatementRecords(session, (session->row_count - 1));
1286
1278
    return(1);
1287
 
  }
1288
1279
 
1289
1280
  // Release latches in case bulk insert takes a long time
1290
1281
  plugin::TransactionalStorageEngine::releaseTemporaryLatches(session);