diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 23:06:43 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 23:06:43 +0200 |
| commit | 6d7cd0b2c03a9e59f52622c44ee4342752cf3be9 (patch) | |
| tree | eced4706a6c1c5b6c4505025e6737b5210c29080 /sql/field.h | |
| parent | a31f2ddea214aa1496ba64c6b2737b5251b7d826 (diff) | |
| parent | ddf48bed99f612ab30069e89e4e94050931e64a9 (diff) | |
| download | mariadb-git-6d7cd0b2c03a9e59f52622c44ee4342752cf3be9.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 aff8216ea2f..b3a773ddddf 100644 --- a/sql/field.h +++ b/sql/field.h @@ -749,7 +749,7 @@ public: void sort_string(uchar *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; } }; @@ -1173,6 +1173,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(uchar *ptr_arg, |