← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-23 10:47:03 UTC
  • mto: This revision was merged to the branch mainline in revision 2348.
  • Revision ID: olafvdspek@gmail.com-20110623104703-hw93svu0vfgcqt9p
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
680
680
     * or similar...
681
681
     */
682
682
    Session& session= *getTable()->in_use;
683
 
    TransactionServices::singleton().truncateTable(session, *getTable());
 
683
    TransactionServices::truncateTable(session, *getTable());
684
684
  }
685
685
 
686
686
  return result;
1261
1261
                                    const unsigned char *before_record,
1262
1262
                                    const unsigned char *after_record)
1263
1263
{
1264
 
  TransactionServices &transaction_services= TransactionServices::singleton();
1265
1264
  Session *const session= table->in_use;
1266
1265
 
1267
 
  if (table->getShare()->getType() || not transaction_services.shouldConstructMessages())
 
1266
  if (table->getShare()->getType() || not TransactionServices::shouldConstructMessages())
1268
1267
    return false;
1269
1268
 
1270
1269
  bool result= false;
1281
1280
     * CREATE TABLE will commit the transaction containing
1282
1281
     * it).
1283
1282
     */
1284
 
    result= transaction_services.insertRecord(*session, *table);
 
1283
    result= TransactionServices::insertRecord(*session, *table);
1285
1284
    break;
1286
1285
  case SQLCOM_REPLACE:
1287
1286
  case SQLCOM_REPLACE_SELECT:
1310
1309
       * as the row to delete (this is the conflicting row), so
1311
1310
       * we need to notify TransactionService to use that row.
1312
1311
       */
1313
 
      transaction_services.deleteRecord(*session, *table, true);
 
1312
      TransactionServices::deleteRecord(*session, *table, true);
1314
1313
      /* 
1315
1314
       * We set the "current" statement message to NULL.  This triggers
1316
1315
       * the replication services component to generate a new statement
1317
1316
       * message for the inserted record which will come next.
1318
1317
       */
1319
 
      transaction_services.finalizeStatementMessage(*session->getStatementMessage(), *session);
 
1318
      TransactionServices::finalizeStatementMessage(*session->getStatementMessage(), *session);
1320
1319
    }
1321
1320
    else
1322
1321
    {
1323
1322
      if (before_record == NULL)
1324
 
        result= transaction_services.insertRecord(*session, *table);
 
1323
        result= TransactionServices::insertRecord(*session, *table);
1325
1324
      else
1326
 
        transaction_services.updateRecord(*session, *table, before_record, after_record);
 
1325
        TransactionServices::updateRecord(*session, *table, before_record, after_record);
1327
1326
    }
1328
1327
    break;
1329
1328
  case SQLCOM_INSERT:
1336
1335
     * an update.
1337
1336
     */
1338
1337
    if (before_record == NULL)
1339
 
      result= transaction_services.insertRecord(*session, *table);
 
1338
      result= TransactionServices::insertRecord(*session, *table);
1340
1339
    else
1341
 
      transaction_services.updateRecord(*session, *table, before_record, after_record);
 
1340
      TransactionServices::updateRecord(*session, *table, before_record, after_record);
1342
1341
    break;
1343
1342
 
1344
1343
  case SQLCOM_UPDATE:
1345
 
    transaction_services.updateRecord(*session, *table, before_record, after_record);
 
1344
    TransactionServices::updateRecord(*session, *table, before_record, after_record);
1346
1345
    break;
1347
1346
 
1348
1347
  case SQLCOM_DELETE:
1349
 
    transaction_services.deleteRecord(*session, *table);
 
1348
    TransactionServices::deleteRecord(*session, *table);
1350
1349
    break;
1351
1350
  default:
1352
1351
    break;