← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

Merge trunk:

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1813
1813
 
1814
1814
 
1815
1815
 
1816
 
void Table::updateCreateInfo(HA_CREATE_INFO *create_info,
1817
 
                             message::Table *table_proto)
 
1816
void Table::updateCreateInfo(message::Table *table_proto)
1818
1817
{
1819
1818
  message::Table::TableOptions *table_options= table_proto->mutable_options();
1820
 
  create_info->table_options= s->db_create_options;
1821
1819
  table_options->set_block_size(s->block_size);
1822
 
  create_info->row_type= s->row_type;
1823
 
  create_info->default_table_charset= s->table_charset;
1824
 
  create_info->table_charset= 0;
1825
1820
  table_options->set_comment(s->getComment());
1826
1821
}
1827
1822
 
3470
3465
{
3471
3466
  if (s->blob_fields + s->varchar_fields == 0)
3472
3467
    return memcmp(this->record[0], this->record[1], (size_t) s->reclength);
 
3468
  
3473
3469
  /* Compare null bits */
3474
 
  if (memcmp(null_flags,
3475
 
             null_flags + s->rec_buff_length,
3476
 
             s->null_bytes))
3477
 
    return true;                                // Diff in NULL value
 
3470
  if (memcmp(null_flags, null_flags + s->rec_buff_length, s->null_bytes))
 
3471
    return true; /* Diff in NULL value */
 
3472
 
3478
3473
  /* Compare updated fields */
3479
3474
  for (Field **ptr= field ; *ptr ; ptr++)
3480
3475
  {