diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 23:04:40 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 23:04:40 +0200 |
| commit | f5bc5381ae6142c4de27b282fb9cd63130b174f6 (patch) | |
| tree | be4ad3f767cede727abc63a97dde0d92d211f27b /sql/field.h | |
| parent | bf70c5dfbc75cd0e84f7284042932ec3a983ed58 (diff) | |
| parent | e409a8a5c0402859ec0754e5d060e3ae06df4c6e (diff) | |
| download | mariadb-git-f5bc5381ae6142c4de27b282fb9cd63130b174f6.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
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
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 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, |