← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/blob.cc

  • Committer: Brian Aker
  • Date: 2010-07-16 19:54:08 UTC
  • mfrom: (1660.1.4 rollup)
  • Revision ID: brian@gaz-20100716195408-8fiuxwmy4mpqq4ko
Rollup patch + fix for not intel processors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/blob.cc
107
107
void Field_blob::store_length(unsigned char *i_ptr, uint32_t i_packlength,
108
108
                  uint32_t i_number)
109
109
{
110
 
  store_length(i_ptr, i_packlength, i_number, table->getShare()->db_low_byte_first);
 
110
  store_length(i_ptr, i_packlength, i_number, getTable()->getShare()->db_low_byte_first);
111
111
}
112
112
 
113
113
 
160
160
uint32_t Field_blob::get_length(uint32_t row_offset)
161
161
{
162
162
  return get_length(ptr+row_offset, this->packlength,
163
 
                    table->getShare()->db_low_byte_first);
 
163
                    getTable()->getShare()->db_low_byte_first);
164
164
}
165
165
 
166
166
 
167
167
uint32_t Field_blob::get_length(const unsigned char *ptr_arg)
168
168
{
169
 
  return get_length(ptr_arg, this->packlength, table->getShare()->db_low_byte_first);
 
169
  return get_length(ptr_arg, this->packlength, getTable()->getShare()->db_low_byte_first);
170
170
}
171
171
 
172
172
 
531
531
 
532
532
uint32_t Field_blob::pack_length() const
533
533
{
534
 
  return (uint32_t) (packlength+table->getShare()->blob_ptr_size);
 
534
  return (uint32_t) (packlength + getTable()->getShare()->blob_ptr_size);
535
535
}
536
536
 
537
537
void Field_blob::sql_type(String &res) const
594
594
  uint32_t const master_packlength=
595
595
    param_data > 0 ? param_data & 0xFF : packlength;
596
596
  uint32_t const length= get_length(from, master_packlength, low_byte_first);
597
 
  table->setWriteSet(field_index);
 
597
  getTable()->setWriteSet(field_index);
598
598
  store(reinterpret_cast<const char*>(from) + master_packlength,
599
599
        length, field_charset);
600
600
  return(from + master_packlength + length);