bk commit into 5.0 tree (holyfoot:1.2326)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2006-12-07 09:11:56+04:00, holyfoot@stripped +3 -0
  merging

  mysql-test/r/gis.result@stripped, 2006-12-07 09:11:52+04:00, holyfoot@stripped +16 -16
    result fixed

  sql/field.cc@stripped, 2006-12-07 09:11:52+04:00, holyfoot@stripped +2 -1
    Field_*::reset() now returns int

  sql/sql_load.cc@stripped, 2006-12-07 09:11:52+04:00, holyfoot@stripped +1 -1
    merging fix

# 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/22372/my50-22372

--- 1.334/sql/field.cc	2006-12-07 09:12:03 +04:00
+++ 1.335/sql/field.cc	2006-12-07 09:12:03 +04:00
@@ -2218,9 +2218,10 @@ Field_new_decimal::Field_new_decimal(uin
 }
 
 
-void Field_new_decimal::reset(void)
+int Field_new_decimal::reset(void)
 {
   store_value(&decimal_zero);
+  return 0;
 }
 
 

--- 1.101/sql/sql_load.cc	2006-12-07 09:12:03 +04:00
+++ 1.102/sql/sql_load.cc	2006-12-07 09:12:03 +04:00
@@ -753,7 +753,7 @@ read_sep_field(THD *thd, COPY_INFO &info
           Field *field= ((Item_field *)item)->field;
           if (field->reset())
           {
-            my_error(ER_WARN_NULL_TO_NOTNULL, MYF(0),sql_field->field->field_name,
+            my_error(ER_WARN_NULL_TO_NOTNULL, MYF(0),field->field_name,
                      thd->row_count);
             DBUG_RETURN(1);
           }

--- 1.36/mysql-test/r/gis.result	2006-12-07 09:12:03 +04:00
+++ 1.37/mysql-test/r/gis.result	2006-12-07 09:12:03 +04:00
@@ -673,6 +673,22 @@ POINT(10 10)
 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;
+create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
+alter table t1 disable keys;
+load data infile '../../std_data/bad_gis_data.dat' into table t1;
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 1
+alter table t1 enable keys;
+drop table t1;
 create table t1 (s1 geometry not null,s2 char(100));
 create trigger t1_bu before update on t1 for each row set new.s1 = null;
 insert into t1 values (null,null);
@@ -695,22 +711,6 @@ create table t1(pt GEOMETRY);
 alter table t1 add primary key pti(pt);
 ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length
 alter table t1 add primary key pti(pt(20));
-drop table t1;
-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;
-create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
-alter table t1 disable keys;
-load data infile '../../std_data/bad_gis_data.dat' into table t1;
-ERROR 01000: Data truncated; NULL supplied to NOT NULL column 'b' at row 1
-alter table t1 enable keys;
 drop table t1;
 create table t1 select GeomFromText('point(1 1)');
 desc t1;