bk commit into 5.1 tree (holyfoot:1.2349)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2006-12-07 15:23:39+04:00, holyfoot@deer.(none) +2 -0
  Merge mysql.com:/home/hf/work/pfix/my50-pfix
  into  mysql.com:/home/hf/work/pfix/my51-pfix
  MERGE: 1.1810.1698.204

  mysql-test/r/gis.result@stripped, 2006-12-07 15:23:33+04:00, holyfoot@deer.(none) +0 -0
    Auto merged
    MERGE: 1.35.1.3

  mysql-test/t/gis.test@stripped, 2006-12-07 15:23:33+04:00, holyfoot@deer.(none) +0 -0
    Auto merged
    MERGE: 1.29.1.2

# 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/pfix/my51-pfix/RESYNC

--- 1.40/mysql-test/r/gis.result	2006-12-07 15:23:47 +04:00
+++ 1.41/mysql-test/r/gis.result	2006-12-07 15:23:47 +04:00
@@ -685,7 +685,7 @@ 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;
+load data infile '../std_data_ln/bad_gis_data.dat' into table t1;
 ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'b' at row 1
 alter table t1 enable keys;
 drop table t1;

--- 1.31/mysql-test/t/gis.test	2006-12-07 15:23:47 +04:00
+++ 1.32/mysql-test/t/gis.test	2006-12-07 15:23:47 +04:00
@@ -385,7 +385,7 @@ drop table t1;
 create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
 alter table t1 disable keys;
 --error 1263
-load data infile '../../std_data/bad_gis_data.dat' into table t1;
+load data infile '../std_data_ln/bad_gis_data.dat' into table t1;
 alter table t1 enable keys;
 drop table t1;