Merge mysql.com:/home/hf/work/31158/my41-31158

into  mysql.com:/home/hf/work/31158/my50-31158


mysql-test/t/gis.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
mysql-test/r/gis.result:
  merging
sql/field.cc:
  merging
This commit is contained in:
unknown 2007-11-17 16:48:57 +04:00
commit 75b8713b48
4 changed files with 120 additions and 2 deletions

View file

@ -34,7 +34,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;
}