~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

  • Committer: Brian Aker
  • Date: 2010-06-05 00:15:57 UTC
  • mfrom: (1589.1.1 drizzle_events)
  • Revision ID: brian@gaz-20100605001557-j1k41ni5k9mis891
Merge in Barry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1460
1460
  DRIZZLE_INSERT_ROW_START(table_share->getSchemaName(), table_share->getTableName());
1461
1461
  setTransactionReadWrite();
1462
1462
  
1463
 
  if (unlikely(plugin::EventObserver::beforeInsertRecord(*(table->in_use), *table_share, buf)))
 
1463
  if (unlikely(plugin::EventObserver::beforeInsertRecord(*table, buf)))
1464
1464
  {
1465
1465
    error= ER_EVENT_OBSERVER_PLUGIN;
1466
1466
  }
1467
1467
  else
1468
1468
  {
1469
1469
    error= doInsertRecord(buf);
1470
 
    if (unlikely(plugin::EventObserver::afterInsertRecord(*(table->in_use), *table_share, buf, error))) 
 
1470
    if (unlikely(plugin::EventObserver::afterInsertRecord(*table, buf, error))) 
1471
1471
    {
1472
1472
      error= ER_EVENT_OBSERVER_PLUGIN;
1473
1473
    }
1499
1499
 
1500
1500
  DRIZZLE_UPDATE_ROW_START(table_share->getSchemaName(), table_share->getTableName());
1501
1501
  setTransactionReadWrite();
1502
 
  if (unlikely(plugin::EventObserver::beforeUpdateRecord(*(table->in_use), *table_share, old_data, new_data)))
 
1502
  if (unlikely(plugin::EventObserver::beforeUpdateRecord(*table, old_data, new_data)))
1503
1503
  {
1504
1504
    error= ER_EVENT_OBSERVER_PLUGIN;
1505
1505
  }
1506
1506
  else
1507
1507
  {
1508
1508
    error= doUpdateRecord(old_data, new_data);
1509
 
    if (unlikely(plugin::EventObserver::afterUpdateRecord(*(table->in_use), *table_share, old_data, new_data, error)))
 
1509
    if (unlikely(plugin::EventObserver::afterUpdateRecord(*table, old_data, new_data, error)))
1510
1510
    {
1511
1511
      error= ER_EVENT_OBSERVER_PLUGIN;
1512
1512
    }
1531
1531
 
1532
1532
  DRIZZLE_DELETE_ROW_START(table_share->getSchemaName(), table_share->getTableName());
1533
1533
  setTransactionReadWrite();
1534
 
  if (unlikely(plugin::EventObserver::beforeDeleteRecord(*(table->in_use), *table_share, buf)))
 
1534
  if (unlikely(plugin::EventObserver::beforeDeleteRecord(*table, buf)))
1535
1535
  {
1536
1536
    error= ER_EVENT_OBSERVER_PLUGIN;
1537
1537
  }
1538
1538
  else
1539
1539
  {
1540
1540
    error= doDeleteRecord(buf);
1541
 
    if (unlikely(plugin::EventObserver::afterDeleteRecord(*(table->in_use), *table_share, buf, error)))
 
1541
    if (unlikely(plugin::EventObserver::afterDeleteRecord(*table, buf, error)))
1542
1542
    {
1543
1543
      error= ER_EVENT_OBSERVER_PLUGIN;
1544
1544
    }