← 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: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/blob.cc
52
52
                       unsigned char null_bit_arg,
53
53
                                   const char *field_name_arg,
54
54
                       TableShare *share,
55
 
                       const CHARSET_INFO * const cs)
 
55
                       const charset_info_st * const cs)
56
56
  :Field_str(ptr_arg,
57
57
             blob_pack_length_to_max_length(sizeof(uint32_t)),
58
58
             null_ptr_arg,
142
142
}
143
143
 
144
144
 
145
 
int Field_blob::store(const char *from,uint32_t length, const CHARSET_INFO * const cs)
 
145
int Field_blob::store(const char *from,uint32_t length, const charset_info_st * const cs)
146
146
{
147
147
  uint32_t copy_length, new_length;
148
148
  const char *well_formed_error_pos;
209
209
 
210
210
int Field_blob::store(double nr)
211
211
{
212
 
  const CHARSET_INFO * const cs=charset();
 
212
  const charset_info_st * const cs=charset();
213
213
  ASSERT_COLUMN_MARKED_FOR_WRITE;
214
214
  value.set_real(nr, NOT_FIXED_DEC, cs);
215
215
  return Field_blob::store(value.ptr(),(uint32_t) value.length(), cs);
218
218
 
219
219
int Field_blob::store(int64_t nr, bool unsigned_val)
220
220
{
221
 
  const CHARSET_INFO * const cs=charset();
 
221
  const charset_info_st * const cs=charset();
222
222
  ASSERT_COLUMN_MARKED_FOR_WRITE;
223
223
  value.set_int(nr, unsigned_val, cs);
224
224
  return Field_blob::store(value.ptr(), (uint32_t) value.length(), cs);
230
230
  int not_used;
231
231
  char *end_not_used, *blob;
232
232
  uint32_t length;
233
 
  const CHARSET_INFO *cs;
 
233
  const charset_info_st *cs;
234
234
 
235
235
  ASSERT_COLUMN_MARKED_FOR_READ;
236
236
 
408
408
  unsigned char *blob1;
409
409
  uint32_t blob_length=get_length(ptr);
410
410
  memcpy(&blob1,ptr+sizeof(uint32_t),sizeof(char*));
411
 
  const CHARSET_INFO * const cs= charset();
 
411
  const charset_info_st * const cs= charset();
412
412
  uint32_t local_char_length= max_key_length / cs->mbmaxlen;
413
413
  local_char_length= my_charpos(cs, blob1, blob1+blob_length,
414
414
                                local_char_length);