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/item_geofunc.cc | |
| 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/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |