diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-17 17:12:18 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-17 17:12:18 +0400 |
commit | e42a22309d9db83f8bc4aef8d7a227fa240405f1 (patch) | |
tree | 8967cd00403e688cc4f312430d342326e049d799 /sql/field.h | |
parent | 5f5696b65a7526ab014d5fe9eba907db2c739c11 (diff) | |
parent | 8a8d634b23f38b1d7eb454036fc734e8e7d27966 (diff) | |
download | mariadb-git-e42a22309d9db83f8bc4aef8d7a227fa240405f1.tar.gz |
Merge mysql.com:/home/hf/work/31158/my50-31158
into mysql.com:/home/hf/work/31158/my51-31158
mysql-test/t/gis.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_geofunc.cc:
Auto merged
mysql-test/r/gis.result:
merging
Diffstat (limited to 'sql/field.h')
-rw-r--r-- | sql/field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index d0d867d0b32..f4314720e86 100644 --- a/sql/field.h +++ b/sql/field.h @@ -25,6 +25,7 @@ #define NOT_FIXED_DEC 31 #define DATETIME_DEC 6 +const uint32 max_field_size= (uint32) 4294967295U; class Send_field; class Protocol; |