diff options
| author | unknown <evgen@moonbone.local> | 2007-05-30 19:35:35 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-05-30 19:35:35 +0400 |
| commit | 937d5f8966005abd6540817f51cd87429be4c11c (patch) | |
| tree | 9cc17888a2b22fe163b087455d74766f17c0a8aa /sql/field.h | |
| parent | d9426a89e45f7211a6b6529c09739972fe0b7914 (diff) | |
| parent | 98b5043a3dfa0faca87a63f72d804beb00789eae (diff) | |
| download | mariadb-git-937d5f8966005abd6540817f51cd87429be4c11c.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
mysql-test/r/olap.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/analyse.result:
Manual merge
mysql-test/r/sp.result:
Manual merge
sql/item_timefunc.cc:
Manual merge
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 52b83192ffa..577bda34135 100644 --- a/sql/field.h +++ b/sql/field.h @@ -742,7 +742,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; } }; |