← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.cc

  • Committer: Stewart Smith
  • Date: 2010-11-07 06:43:17 UTC
  • mfrom: (1909 merge)
  • mto: This revision was merged to the branch mainline in revision 1915.
  • Revision ID: stewart@flamingspork.com-20101107064317-i0usp0cqk97ftxev
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.cc
27
27
 
28
28
#include <string>
29
29
 
30
 
using namespace drizzled;
31
30
using namespace std;
32
31
 
 
32
namespace drizzled
 
33
{
 
34
 
33
35
/****************************************************************************
34
36
  VARCHAR type
35
37
  Data in field->ptr is stored as:
54
56
                                 unsigned char *null_ptr_arg,
55
57
                                 unsigned char null_bit_arg,
56
58
                                 const char *field_name_arg,
57
 
                                 TableShare *share,
58
 
                                 const CHARSET_INFO * const cs)
59
 
  :Field_str(ptr_arg,
60
 
             len_arg,
61
 
             null_ptr_arg,
62
 
             null_bit_arg,
63
 
             field_name_arg, cs),
64
 
   length_bytes(length_bytes_arg)
 
59
                                 const CHARSET_INFO * const cs) :
 
60
  Field_str(ptr_arg,
 
61
            len_arg,
 
62
            null_ptr_arg,
 
63
            null_bit_arg,
 
64
            field_name_arg, cs),
 
65
length_bytes(length_bytes_arg)
65
66
{
66
 
  share->varchar_fields++;
67
67
}
68
68
 
69
69
Field_varstring::Field_varstring(uint32_t len_arg,
70
70
                                 bool maybe_null_arg,
71
71
                                 const char *field_name_arg,
72
 
                                 TableShare *share,
73
 
                                 const CHARSET_INFO * const cs)
74
 
  :Field_str((unsigned char*) 0,
75
 
             len_arg,
76
 
             maybe_null_arg ? (unsigned char*) "": 0,
77
 
             0,
78
 
             field_name_arg,
79
 
             cs),
80
 
   length_bytes(len_arg < 256 ? 1 :2)
 
72
                                 const CHARSET_INFO * const cs) :
 
73
  Field_str((unsigned char*) 0,
 
74
            len_arg,
 
75
            maybe_null_arg ? (unsigned char*) "": 0,
 
76
            0,
 
77
            field_name_arg,
 
78
            cs),
 
79
  length_bytes(len_arg < 256 ? 1 :2)
81
80
{
82
 
  share->varchar_fields++;
83
81
}
84
82
 
85
83
int Field_varstring::store(const char *from,uint32_t length, const CHARSET_INFO * const cs)
118
116
  char buff[64];
119
117
  uint32_t  length;
120
118
  length= (uint32_t) (field_charset->cset->int64_t10_to_str)(field_charset,
121
 
                                                          buff,
122
 
                                                          sizeof(buff),
123
 
                                                          (unsigned_val ? 10:
124
 
                                                           -10),
125
 
                                                           nr);
 
119
                                                             buff,
 
120
                                                             sizeof(buff),
 
121
                                                             (unsigned_val ? 10: -10),
 
122
                                                             nr);
126
123
  return Field_varstring::store(buff, length, field_charset);
127
124
}
128
125
 
222
219
  uint32_t local_char_length= max_key_length / field_charset->mbmaxlen;
223
220
 
224
221
  local_char_length= my_charpos(field_charset, ptr + length_bytes,
225
 
                          ptr + length_bytes + length, local_char_length);
 
222
                                ptr + length_bytes + length, local_char_length);
226
223
  set_if_smaller(length, local_char_length);
227
224
  return field_charset->coll->strnncollsp(field_charset,
228
225
                                          ptr + length_bytes,
267
264
  }
268
265
 
269
266
  tot_length= my_strnxfrm(field_charset,
270
 
                          to, length, ptr + length_bytes,
271
 
                          tot_length);
 
267
                          to, length, ptr + length_bytes,
 
268
                          tot_length);
272
269
  assert(tot_length == length);
273
270
}
274
271
 
481
478
  }
482
479
  return res;
483
480
}
 
481
 
 
482
} /* namespace drizzled */