diff options
author | unknown <df@pippilotta.erinye.com> | 2007-06-29 12:19:38 +0200 |
---|---|---|
committer | unknown <df@pippilotta.erinye.com> | 2007-06-29 12:19:38 +0200 |
commit | eefc9a1e30c29c9ca5ea27ead2f7c6521b34a134 (patch) | |
tree | de4521fbc271e7023524a09db9e12022bc56f36f /sql/field.cc | |
parent | 637d9f1c5061ad0553c549199464c5db98eaec1f (diff) | |
parent | f8034d36ba5670e72374d61ca4901a71adbd6d9f (diff) | |
download | mariadb-git-eefc9a1e30c29c9ca5ea27ead2f7c6521b34a134.tar.gz |
Merge dev:/data0/mysqldev/my/build-200706140748-5.0.44/mysql-5.0-release
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index f81b1c33fa7..bde1760a94d 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6268,6 +6268,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table, is 2. ****************************************************************************/ +const uint Field_varstring::MAX_SIZE= UINT_MAX16; int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs) { |