bk commit into 4.1 tree (hf:1.2353) BUG#11083

[holyfoot]

Below is the list of changes that have just been committed into a local
4.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
  1.2353 05/07/27 21:54:02 hf@deer.(none) +2 -0
  Fix for bug #11083 (myisam test fails witout-geometry)

  mysql-test/t/myisam.test
    1.38 05/07/27 21:53:20 hf@deer.(none) +1 -1
    we can get two kings of errors here

  mysql-test/r/myisam.result
    1.50 05/07/27 21:53:20 hf@deer.(none) +1 -1
    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-4.1.11083

--- 1.49/mysql-test/r/myisam.result	Sat May 14 03:21:43 2005
+++ 1.50/mysql-test/r/myisam.result	Wed Jul 27 21:53:20 2005
@@ -499,7 +499,7 @@
 1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	2	Using index; Distinct
 drop table t1,t2;
 CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
-ERROR 42000: This version of MySQL doesn't yet support 'RTREE INDEX'
+Got one of the listed errors
 create table t1 (a int, b varchar(200), c text not null) checksum=1;
 create table t2 (a int, b varchar(200), c text not null) checksum=0;
 insert t1 values (1, "aaa", "bbb"), (NULL, "", "ccccc"), (0, NULL, "");

--- 1.37/mysql-test/t/myisam.test	Sat May 14 03:21:43 2005
+++ 1.38/mysql-test/t/myisam.test	Wed Jul 27 21:53:20 2005
@@ -476,7 +476,7 @@
 #
 # Test RTREE index
 #
---error 1235
+--error 1235, 1289
 CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
 # INSERT INTO t1 VALUES (1,1),(1,1);
 # DELETE FROM rt WHERE a<1;