bk commit into 4.1 tree (holyfoot:1.2508) BUG#10166

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2508 06/06/22 22:11:27 holyfoot@deer.(none) +3 -0
  bug #10166 (Signed byte values cause data to be padded)
  
  The AsBinary function returns VARCHAR data type with binary collation.
  It can cause problem for clients that treat that kind of data as
  different from BLOB type.
  So now AsBinary returns BLOB.

  sql/item_geofunc.h
    1.10 06/06/22 22:10:40 holyfoot@stripped +2 -0
    Now we return MYSQL_TYPE_BLOB for asBinary function

  mysql-test/t/gis.test
    1.20 06/06/22 22:10:40 holyfoot@stripped +7 -0
    test case added

  mysql-test/r/gis.result
    1.22 06/06/22 22:10:40 holyfoot@stripped +10 -0
    result fixed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.10166

--- 1.21/mysql-test/r/gis.result	Wed Sep 21 14:34:17 2005
+++ 1.22/mysql-test/r/gis.result	Thu Jun 22 22:10:40 2006
@@ -661,3 +661,13 @@
 select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));
 (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))))
 POINT(10 10)
+create table t1 (g GEOMETRY);
+select * from t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def	test	t1	t1	g	g	255	4294967295	0	Y	144	0	63
+g
+select asbinary(g) from t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					asbinary(g)	252	8192	0	Y	128	0	63
+asbinary(g)
+drop table t1;

--- 1.19/mysql-test/t/gis.test	Wed Sep 21 14:34:17 2005
+++ 1.20/mysql-test/t/gis.test	Thu Jun 22 22:10:40 2006
@@ -364,3 +364,10 @@
 select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));
 
 # End of 4.1 tests
+
+--enable_metadata
+create table t1 (g GEOMETRY);
+select * from t1;
+select asbinary(g) from t1;
+--disable_metadata
+drop table t1;

--- 1.9/sql/item_geofunc.h	Wed May  4 18:05:53 2005
+++ 1.10/sql/item_geofunc.h	Thu Jun 22 22:10:40 2006
@@ -32,6 +32,7 @@
   Item_geometry_func(Item *a,Item *b,Item *c) :Item_str_func(a,b,c) {}
   Item_geometry_func(List<Item> &list) :Item_str_func(list) {}
   void fix_length_and_dec();
+  enum_field_types field_type() const  { return MYSQL_TYPE_GEOMETRY; }
 };
 
 class Item_func_geometry_from_text: public Item_geometry_func
@@ -67,6 +68,7 @@
   Item_func_as_wkb(Item *a): Item_geometry_func(a) {}
   const char *func_name() const { return "aswkb"; }
   String *val_str(String *);
+  enum_field_types field_type() const  { return MYSQL_TYPE_BLOB; }
 };
 
 class Item_func_geometry_type: public Item_str_func