bk commit into 5.0 tree (ingo:1.2206)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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.2206 06/07/05 16:23:18 ingo@stripped +3 -0
  After merge fix

  mysql-test/t/gis.test
    1.27 06/07/05 16:23:13 ingo@stripped +7 -5
    After merge fix

  mysql-test/r/key.result
    1.30 06/07/05 16:23:13 ingo@stripped +2 -2
    After merge fix

  mysql-test/r/gis.result
    1.32 06/07/05 16:23:12 ingo@stripped +10 -9
    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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-ateam

--- 1.29/mysql-test/r/key.result	2006-07-05 11:05:02 +02:00
+++ 1.30/mysql-test/r/key.result	2006-07-05 16:23:13 +02:00
@@ -336,8 +336,8 @@ UNIQUE i1idx (i1),
 UNIQUE i2idx (i2));
 desc t1;
 Field	Type	Null	Key	Default	Extra
-i1	int(11)		UNI	0	
-i2	int(11)		UNI	0	
+i1	int(11)	NO	UNI		
+i2	int(11)	NO	UNI		
 drop table t1;
 create table t1 (
 c1 int,

--- 1.31/mysql-test/r/gis.result	2006-07-05 11:20:03 +02:00
+++ 1.32/mysql-test/r/gis.result	2006-07-05 16:23:12 +02:00
@@ -671,15 +671,6 @@ POINT(10 10)
 select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));
 (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))))
 POINT(10 10)
-create table t1 (g GEOMETRY);
-select * from t1;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	test	t1	t1	g	g	255	4294967295	0	Y	144	0	63
-g
-select asbinary(g) from t1;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					asbinary(g)	252	8192	0	Y	128	0	63
-asbinary(g)
 create table t1 (s1 geometry not null,s2 char(100));
 create trigger t1_bu before update on t1 for each row set new.s1 = null;
 insert into t1 values (null,null);
@@ -702,4 +693,14 @@ create table t1(pt GEOMETRY);
 alter table t1 add primary key pti(pt);
 ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length
 alter table t1 add primary key pti(pt(20));
+drop table t1;
+create table t1 (g GEOMETRY);
+select * from t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def	test	t1	t1	g	g	255	4294967295	0	Y	144	0	63
+g
+select asbinary(g) from t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					asbinary(g)	252	8192	0	Y	128	0	63
+asbinary(g)
 drop table t1;

--- 1.26/mysql-test/t/gis.test	2006-07-05 11:20:04 +02:00
+++ 1.27/mysql-test/t/gis.test	2006-07-05 16:23:13 +02:00
@@ -377,11 +377,6 @@ select (asWKT(geomfromwkb((0x01010000000
 
 # End of 4.1 tests
 
---enable_metadata
-create table t1 (g GEOMETRY);
-select * from t1;
-select asbinary(g) from t1;
---disable_metadata
 #
 # Bug #12281 (Geometry: crash in trigger)
 #
@@ -413,4 +408,11 @@ create table t1(pt GEOMETRY);
 --error 1170
 alter table t1 add primary key pti(pt);
 alter table t1 add primary key pti(pt(20));
+drop table t1;
+
+--enable_metadata
+create table t1 (g GEOMETRY);
+select * from t1;
+select asbinary(g) from t1;
+--disable_metadata
 drop table t1;