bk commit into 5.0 tree (istruewing:1.2418) BUG#25673

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing 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-08 12:08:59+01:00, istruewing@stripped +1 -0
  Bug#25673 - spatial index corruption, error 126 incorrect key file for table
  After merge fix

  mysql-test/r/gis-rtree.result@stripped, 2007-03-08 12:08:56+01:00, istruewing@stripped
+1 -0
    Bug#25673 - spatial index corruption, error 126 incorrect key file for table
    After merge 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-bug25673

--- 1.24/mysql-test/r/gis-rtree.result	2007-03-08 12:09:04 +01:00
+++ 1.25/mysql-test/r/gis-rtree.result	2007-03-08 12:09:04 +01:00
@@ -1424,6 +1424,7 @@ UPDATE t1 set spatial_point=GeomFromText
 CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+DROP TABLE t1;
 CREATE TABLE t1(foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );
 INSERT INTO t1(foo) VALUES (NULL);
 ERROR 23000: Column 'foo' cannot be null