diff options
| author | tsmith@quadxeon.mysql.com <> | 2007-06-05 23:04:40 +0200 |
|---|---|---|
| committer | tsmith@quadxeon.mysql.com <> | 2007-06-05 23:04:40 +0200 |
| commit | d2fe24d1ef367483ff6cf775f9f151734933bf32 (patch) | |
| tree | be4ad3f767cede727abc63a97dde0d92d211f27b /sql/field.h | |
| parent | 173d07de7806abfce4ccc51e6d16686b2e60dcd2 (diff) | |
| parent | d9fcc304d9b02b97bc259dc74d3b33f44885258d (diff) | |
| download | mariadb-git-d2fe24d1ef367483ff6cf775f9f151734933bf32.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index a0fd1a96480..46efb150205 100644 --- a/sql/field.h +++ b/sql/field.h @@ -679,7 +679,7 @@ public: void sort_string(char *buff,uint length); uint32 pack_length() const { return 4; } void sql_type(String &str) const; - uint32 max_display_length() { return 11; } + uint32 max_display_length() { return MY_INT32_NUM_DECIMAL_DIGITS; } }; @@ -1107,6 +1107,11 @@ public: class Field_varstring :public Field_longstr { public: + /* + The maximum space available in a Field_varstring, in bytes. See + length_bytes. + */ + static const uint MAX_SIZE= UINT_MAX16; /* Store number of bytes used to store length (1 or 2) */ uint32 length_bytes; Field_varstring(char *ptr_arg, |