bk commit into 5.1 tree (holyfoot:1.2394) BUG#22682

[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, 2007-01-24 14:49:36+04:00, holyfoot@stripped +9 -0
  bug #22682 Test fails --without-geometry
  geometry dependent parts moved to proper .test files

  BitKeeper/etc/ignore@stripped, 2007-01-24 14:49:35+04:00, holyfoot@stripped +1 -0
    Added libmysqld/sql_servers.cc to the ignore list

  mysql-test/r/gis.result@stripped, 2007-01-24 14:49:34+04:00, holyfoot@stripped +11 -0
    result fixed

  mysql-test/r/innodb.result@stripped, 2007-01-24 14:49:34+04:00, holyfoot@stripped +0 -2
    result fixed

  mysql-test/r/innodb_gis.result@stripped, 2007-01-24 14:49:34+04:00, holyfoot@stripped +2 -0
    result fixed

  mysql-test/r/view.result@stripped, 2007-01-24 14:49:34+04:00, holyfoot@stripped +0 -11
    result fixed

  mysql-test/t/gis.test@stripped, 2007-01-24 14:49:34+04:00, holyfoot@stripped +10 -0
    HAVE_GEOMETRY dependent part moved here from view.test

  mysql-test/t/innodb.test@stripped, 2007-01-24 14:49:34+04:00, holyfoot@stripped +0 -6
    HAVE_GEOMETRY dependent part moved to innodb_gis.test

  mysql-test/t/innodb_gis.test@stripped, 2007-01-24 14:49:35+04:00, holyfoot@stripped +6 -0
    HAVE_GEOMETRY dependent part moved here from innodb.test

  mysql-test/t/view.test@stripped, 2007-01-24 14:49:35+04:00, holyfoot@stripped +0 -9
    HAVE_GEOMETRY dependent part moved to gis.test

# 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:	hfmain.(none)
# Root:	/d2/hf/22682

--- 1.194/mysql-test/r/view.result	2007-01-24 14:49:41 +04:00
+++ 1.195/mysql-test/r/view.result	2007-01-24 14:49:41 +04:00
@@ -2060,17 +2060,6 @@ CALL p1();
 DROP PROCEDURE p1;
 DROP VIEW v1;
 DROP TABLE t1;
-create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);
-create view v1 as select * from t1;
-desc v1;
-Field	Type	Null	Key	Default	Extra
-f1	tinyint(1)	YES		NULL	
-f2	char(1)	YES		NULL	
-f3	varchar(1)	YES		NULL	
-f4	geometry	YES		NULL	
-f5	datetime	YES		NULL	
-drop view v1;
-drop table t1;
 create table t1(f1 datetime);
 insert into t1 values('2005.01.01 12:0:0');
 create view v1 as select f1, subtime(f1, '1:1:1') as sb from t1;

--- 1.175/mysql-test/t/view.test	2007-01-24 14:49:41 +04:00
+++ 1.176/mysql-test/t/view.test	2007-01-24 14:49:41 +04:00
@@ -1879,15 +1879,6 @@ DROP VIEW v1;
 DROP TABLE t1;
 
 #
-# Bug #11335 View redefines column types
-#
-create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);
-create view v1 as select * from t1;
-desc v1;
-drop view v1;
-drop table t1;
-
-#
 # Bug #11760 Typo in Item_func_add_time::print() results in NULLs returned
 #             subtime() in view
 create table t1(f1 datetime);

--- 1.7/mysql-test/r/innodb_gis.result	2007-01-24 14:49:41 +04:00
+++ 1.8/mysql-test/r/innodb_gis.result	2007-01-24 14:49:41 +04:00
@@ -460,3 +460,5 @@ ERROR 22003: Cannot get geometry object 
 insert into t1 (fl) values (pointfromtext('point(1,1)'));
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;
+create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
+ERROR HY000: The used table type doesn't support SPATIAL indexes

--- 1.2/mysql-test/t/innodb_gis.test	2007-01-24 14:49:41 +04:00
+++ 1.3/mysql-test/t/innodb_gis.test	2007-01-24 14:49:41 +04:00
@@ -1,3 +1,9 @@
 --source include/have_innodb.inc
 SET storage_engine=innodb;
 --source include/gis_generic.inc
+
+#
+# Bug #15680 (SPATIAL key in innodb)
+#
+--error ER_TABLE_CANT_HANDLE_SPKEYS
+create table t1 (g geometry not null, spatial gk(g)) engine=innodb;

--- 1.183/mysql-test/r/innodb.result	2007-01-24 14:49:41 +04:00
+++ 1.184/mysql-test/r/innodb.result	2007-01-24 14:49:41 +04:00
@@ -3447,8 +3447,6 @@ SELECT p0.a FROM t2 p0 WHERE BINARY p0.b
 a
 1
 drop table t2, t1;
-create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
-ERROR HY000: The used table type doesn't support SPATIAL indexes
 CREATE TABLE t1 ( a int ) ENGINE=innodb;
 BEGIN;
 INSERT INTO t1 VALUES (1);

--- 1.153/mysql-test/t/innodb.test	2007-01-24 14:49:41 +04:00
+++ 1.154/mysql-test/t/innodb.test	2007-01-24 14:49:41 +04:00
@@ -2489,12 +2489,6 @@ SELECT p0.a FROM t2 p0 WHERE BINARY p0.b
 drop table t2, t1;
 
 #
-# Bug #15680 (SPATIAL key in innodb)
-#
---error ER_TABLE_CANT_HANDLE_SPKEYS
-create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
-
-#
 # Test optimize on table with open transaction
 #
 

--- 1.40/mysql-test/r/gis.result	2007-01-24 14:49:41 +04:00
+++ 1.41/mysql-test/r/gis.result	2007-01-24 14:49:41 +04:00
@@ -718,3 +718,14 @@ desc t1;
 Field	Type	Null	Key	Default	Extra
 GeomFromText('point(1 1)')	geometry	NO			
 drop table t1;
+create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);
+create view v1 as select * from t1;
+desc v1;
+Field	Type	Null	Key	Default	Extra
+f1	tinyint(1)	YES		NULL	
+f2	char(1)	YES		NULL	
+f3	varchar(1)	YES		NULL	
+f4	geometry	YES		NULL	
+f5	datetime	YES		NULL	
+drop view v1;
+drop table t1;

--- 1.32/mysql-test/t/gis.test	2007-01-24 14:49:41 +04:00
+++ 1.33/mysql-test/t/gis.test	2007-01-24 14:49:41 +04:00
@@ -428,3 +428,13 @@ drop table t1;
 create table t1 select GeomFromText('point(1 1)');
 desc t1;
 drop table t1;
+
+#
+# Bug #11335 View redefines column types
+#
+create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);
+create view v1 as select * from t1;
+desc v1;
+drop view v1;
+drop table t1;
+

--- 1.268/BitKeeper/etc/ignore	2007-01-24 14:49:41 +04:00
+++ 1.269/BitKeeper/etc/ignore	2007-01-24 14:49:41 +04:00
@@ -2933,3 +2933,4 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+libmysqld/sql_servers.cc