← Back to branch summary

~stewart/drizzle/embedded-innodb-rnd-read

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

  • Committer: Stewart Smith
  • Date: 2010-03-30 13:09:42 UTC
  • mfrom: (1310.1.38)
  • Revision ID: stewart@flamingspork.com-20100330130942-859uivdm20p36sk3
Merged embedded-innodb-write-row into embedded-innodb-rnd-read.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
1450
1450
  {
1451
1451
    if (lock_type == F_RDLCK)
1452
1452
    {
1453
 
      DRIZZLE_CURSOR_RDLOCK_START(table_share->db.str,
1454
 
                                  table_share->table_name.str);
 
1453
      DRIZZLE_CURSOR_RDLOCK_START(table_share->getSchemaName(),
 
1454
                                  table_share->getTableName());
1455
1455
    }
1456
1456
    else if (lock_type == F_WRLCK)
1457
1457
    {
1458
 
      DRIZZLE_CURSOR_WRLOCK_START(table_share->db.str,
1459
 
                                  table_share->table_name.str);
 
1458
      DRIZZLE_CURSOR_WRLOCK_START(table_share->getSchemaName(),
 
1459
                                  table_share->getTableName());
1460
1460
    }
1461
1461
    else if (lock_type == F_UNLCK)
1462
1462
    {
1463
 
      DRIZZLE_CURSOR_UNLOCK_START(table_share->db.str,
1464
 
                                  table_share->table_name.str);
 
1463
      DRIZZLE_CURSOR_UNLOCK_START(table_share->getSchemaName(),
 
1464
                                  table_share->getTableName());
1465
1465
    }
1466
1466
  }
1467
1467
 
1528
1528
  if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
1529
1529
    table->timestamp_field->set_time();
1530
1530
 
1531
 
  DRIZZLE_INSERT_ROW_START(table_share->db.str, table_share->table_name.str);
 
1531
  DRIZZLE_INSERT_ROW_START(table_share->getSchemaName(), table_share->getTableName());
1532
1532
  setTransactionReadWrite();
1533
1533
  error= write_row(buf);
1534
1534
  DRIZZLE_INSERT_ROW_DONE(error);
1555
1555
   */
1556
1556
  assert(new_data == table->record[0]);
1557
1557
 
1558
 
  DRIZZLE_UPDATE_ROW_START(table_share->db.str, table_share->table_name.str);
 
1558
  DRIZZLE_UPDATE_ROW_START(table_share->getSchemaName(), table_share->getTableName());
1559
1559
  setTransactionReadWrite();
1560
1560
  error= update_row(old_data, new_data);
1561
1561
  DRIZZLE_UPDATE_ROW_DONE(error);
1575
1575
{
1576
1576
  int error;
1577
1577
 
1578
 
  DRIZZLE_DELETE_ROW_START(table_share->db.str, table_share->table_name.str);
 
1578
  DRIZZLE_DELETE_ROW_START(table_share->getSchemaName(), table_share->getTableName());
1579
1579
  setTransactionReadWrite();
1580
1580
  error= delete_row(buf);
1581
1581
  DRIZZLE_DELETE_ROW_DONE(error);