← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.h

  • Committer: lbieber
  • Date: 2010-09-23 15:49:15 UTC
  • mfrom: (1788.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100923154915-mshh9pwln0igdwrn
Merge Brian - Rollup patch of enum + style on varchar. This modifies enum to always being the same value.
Merge Stewart - Fix embedded_innodb plugin now that TIMESTAMP is 8 bytes. 
Merge Shrews - fix bug 643630 -  Transaction_reader not handling CHAR values that include quotes properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.h
41
41
    length_bytes.
42
42
  */
43
43
  static const uint32_t MAX_SIZE;
 
44
private:
44
45
  /* Store number of bytes used to store length (1 or 2) */
45
46
  uint32_t length_bytes;
 
47
public:
46
48
  Field_varstring(unsigned char *ptr_arg,
47
49
                  uint32_t len_arg,
48
50
                  uint32_t length_bytes_arg,
62
64
  bool zero_pack() const { return 0; }
63
65
  int  reset(void) { memset(ptr, 0, field_length+length_bytes); return 0; }
64
66
  uint32_t pack_length() const { return (uint32_t) field_length+length_bytes; }
 
67
  uint32_t pack_length_no_ptr() const { return length_bytes; }
65
68
  uint32_t key_length() const { return (uint32_t) field_length; }
66
69
  uint32_t sort_length() const
67
70
  {
68
71
    return (uint32_t) field_length + (field_charset == &my_charset_bin ?
69
 
                                    length_bytes : 0);
 
72
                                      length_bytes : 0);
70
73
  }
71
74
  int  store(const char *to,uint32_t length, const CHARSET_INFO * const charset);
72
75