bk commit into 5.1 tree (gkodinov:1.2594)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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-10-23 14:26:57+03:00, gkodinov@stripped +1 -0
  merge 5.0-opt -> 5.1-opt for bug 30825

  mysql-test/r/innodb_gis.result@stripped, 2007-10-23 14:26:54+03:00, gkodinov@stripped +1 -0
    merge 5.0-opt -> 5.1-opt for bug 30825

diff -Nrup a/mysql-test/r/innodb_gis.result b/mysql-test/r/innodb_gis.result
--- a/mysql-test/r/innodb_gis.result	2007-10-23 11:44:09 +03:00
+++ b/mysql-test/r/innodb_gis.result	2007-10-23 14:26:54 +03:00
@@ -545,6 +545,7 @@ SELECT Overlaps(@horiz1, @point2) FROM D
 Overlaps(@horiz1, @point2)
 0
 DROP TABLE t1;
+End of 5.0 tests
 CREATE TABLE t1 (p POINT);
 CREATE TABLE t2 (p POINT, INDEX(p));
 INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));