← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/transaction_services.cc
1303
1303
  message::InsertHeader *header= statement.mutable_insert_header();
1304
1304
  message::TableMetadata *table_metadata= header->mutable_table_metadata();
1305
1305
 
1306
 
  string schema_name;
1307
 
  (void) table.getShare()->getSchemaName(schema_name);
1308
 
  string table_name;
1309
 
  (void) table.getShare()->getTableName(table_name);
1310
 
 
1311
 
  table_metadata->set_schema_name(schema_name.c_str(), schema_name.length());
1312
 
  table_metadata->set_table_name(table_name.c_str(), table_name.length());
1313
 
 
1314
 
  Field *current_field;
 
1306
  table_metadata->set_schema_name(table.getShare()->getSchemaName());
 
1307
  table_metadata->set_table_name(table.getShare()->getTableName());
 
1308
 
1315
1309
  Field **table_fields= table.getFields();
1316
1310
 
1317
1311
  message::FieldMetadata *field_metadata;
1319
1313
  /* We will read all the table's fields... */
1320
1314
  table.setReadSet();
1321
1315
 
1322
 
  while ((current_field= *table_fields++) != NULL) 
 
1316
  while (Field* current_field= *table_fields++) 
1323
1317
  {
1324
1318
    field_metadata= header->add_field_metadata();
1325
1319
    field_metadata->set_name(current_field->field_name);
1493
1487
  message::UpdateHeader *header= statement.mutable_update_header();
1494
1488
  message::TableMetadata *table_metadata= header->mutable_table_metadata();
1495
1489
 
1496
 
  string schema_name;
1497
 
  (void) table.getShare()->getSchemaName(schema_name);
1498
 
  string table_name;
1499
 
  (void) table.getShare()->getTableName(table_name);
1500
 
 
1501
 
  table_metadata->set_schema_name(schema_name.c_str(), schema_name.length());
1502
 
  table_metadata->set_table_name(table_name.c_str(), table_name.length());
 
1490
  table_metadata->set_schema_name(table.getShare()->getSchemaName());
 
1491
  table_metadata->set_table_name(table.getShare()->getTableName());
1503
1492
 
1504
1493
  Field *current_field;
1505
1494
  Field **table_fields= table.getFields();
1765
1754
  message::DeleteHeader *header= statement.mutable_delete_header();
1766
1755
  message::TableMetadata *table_metadata= header->mutable_table_metadata();
1767
1756
 
1768
 
  string schema_name;
1769
 
  (void) table.getShare()->getSchemaName(schema_name);
1770
 
  string table_name;
1771
 
  (void) table.getShare()->getTableName(table_name);
1772
 
 
1773
 
  table_metadata->set_schema_name(schema_name.c_str(), schema_name.length());
1774
 
  table_metadata->set_table_name(table_name.c_str(), table_name.length());
 
1757
  table_metadata->set_schema_name(table.getShare()->getSchemaName());
 
1758
  table_metadata->set_table_name(table.getShare()->getTableName());
1775
1759
 
1776
1760
  Field *current_field;
1777
1761
  Field **table_fields= table.getFields();
2043
2027
  message::TruncateTableStatement *truncate_statement= statement->mutable_truncate_table_statement();
2044
2028
  message::TableMetadata *table_metadata= truncate_statement->mutable_table_metadata();
2045
2029
 
2046
 
  string schema_name;
2047
 
  (void) table.getShare()->getSchemaName(schema_name);
2048
 
 
2049
 
  string table_name;
2050
 
  (void) table.getShare()->getTableName(table_name);
2051
 
 
2052
 
  table_metadata->set_schema_name(schema_name.c_str(), schema_name.length());
2053
 
  table_metadata->set_table_name(table_name.c_str(), table_name.length());
 
2030
  table_metadata->set_schema_name(table.getShare()->getSchemaName());
 
2031
  table_metadata->set_table_name(table.getShare()->getTableName());
2054
2032
 
2055
2033
  finalizeStatementMessage(*statement, session);
2056
2034