bk commit into 5.0 tree (hf:1.1950) BUG#12281

[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
  1.1950 05/08/05 20:26:55 hf@deer.(none) +2 -0
  testcase added to fix for bug #12281 (Geometry & trigger crash)

  mysql-test/t/gis.test
    1.20 05/08/05 20:26:50 hf@deer.(none) +10 -0
    testcase added

  mysql-test/r/gis.result
    1.23 05/08/05 20:26:50 hf@deer.(none) +5 -0
    test 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:	hf
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.12281

--- 1.22/mysql-test/r/gis.result	Fri Apr 29 20:21:56 2005
+++ 1.23/mysql-test/r/gis.result	Fri Aug  5 20:26:50 2005
@@ -665,3 +665,8 @@
 insert into t1 values (pointfromtext('point(1,1)'));
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 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);
+ERROR 23000: Column 's1' cannot be null
+drop table t1;

--- 1.19/mysql-test/t/gis.test	Thu Jul 28 18:12:34 2005
+++ 1.20/mysql-test/t/gis.test	Fri Aug  5 20:26:50 2005
@@ -373,3 +373,13 @@
 drop table t1;
 
 # End of 4.1 tests
+
+#
+# Bug #12281 (Geometry: crash in trigger)
+#
+
+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;
+--error 1048
+insert into t1 values (null,null);
+drop table t1;