bk commit into 5.0 tree (tsmith:1.2468)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith 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, 2007-03-07 23:49:46+01:00, tsmith@stripped +1 -0
  update test results for bdb_gis after merge of fix for b26038

  mysql-test/r/bdb_gis.result@stripped, 2007-03-07 23:49:21+01:00, tsmith@stripped +2 -2
    update test results for bdb_gis after merge of fix for b26038

# 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:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50-bdbfix

--- 1.3/mysql-test/r/bdb_gis.result	2007-03-07 23:49:55 +01:00
+++ 1.4/mysql-test/r/bdb_gis.result	2007-03-07 23:49:55 +01:00
@@ -446,7 +446,7 @@
 insert IGNORE into t1 values ('Garbage');
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;
-create table t1 (fl geometry);
+create table t1 (fl geometry not null);
 insert into t1 values (1);
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 insert into t1 values (1.11);
@@ -454,5 +454,5 @@
 insert into t1 values ("qwerty");
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 insert into t1 values (pointfromtext('point(1,1)'));
-ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+ERROR 23000: Column 'fl' cannot be null
 drop table t1;