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 | 5fac132b5f5d81af73d22c5bf2e13505d9927930 (patch) | |
| tree | 8967cd00403e688cc4f312430d342326e049d799 /sql | |
| parent | b61146e1f6cb24ecf6b56a199abb13be5e4e7a8e (diff) | |
| parent | be99cfef545468a0257a0798dabda491224f33f7 (diff) | |
| download | mariadb-git-5fac132b5f5d81af73d22c5bf2e13505d9927930.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')
| -rw-r--r-- | sql/field.h | 1 | ||||
| -rw-r--r-- | sql/item_geofunc.cc | 2 |
2 files changed, 2 insertions, 1 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; diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 332e88c950d..2da5965c94d 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -37,7 +37,7 @@ void Item_geometry_func::fix_length_and_dec() { collation.set(&my_charset_bin); decimals=0; - max_length=MAX_BLOB_WIDTH; + max_length= max_field_size; maybe_null= 1; } |