Port r95 and r96 from branches/5.0 to trunk:

Add tests for >1K keys on 32-bit platforms.

Clean up innodb_gis.test.

mysql-test/innodb.result

@@ -2862,3 +2862,16 @@ truncate t4;
 truncate t1;
 truncate t3;
 drop table t4,t3,t2,t1;
+create table t1 (a varchar(255) character set utf8,
+b varchar(255) character set utf8,
+c varchar(255) character set utf8,
+d varchar(255) character set utf8,
+key (a,b,c,d)) engine=innodb;
+drop table t1;
+create table t1 (a varchar(255) character set utf8,
+b varchar(255) character set utf8,
+c varchar(255) character set utf8,
+d varchar(255) character set utf8,
+e varchar(255) character set utf8,
+key (a,b,c,d,e)) engine=innodb;
+ERROR 42000: Specified key was too long; max key length is 3072 bytes

mysql-test/innodb.test

@@ -1849,3 +1849,22 @@ truncate t1;
 truncate t3;
 
 drop table t4,t3,t2,t1;
+
+
+#
+# Test that we can create a large (>1K) key
+#
+create table t1 (a varchar(255) character set utf8,
+                 b varchar(255) character set utf8,
+                 c varchar(255) character set utf8,
+                 d varchar(255) character set utf8,
+                 key (a,b,c,d)) engine=innodb;
+drop table t1;
+--error ER_TOO_LONG_KEY
+create table t1 (a varchar(255) character set utf8,
+                 b varchar(255) character set utf8,
+                 c varchar(255) character set utf8,
+                 d varchar(255) character set utf8,
+                 e varchar(255) character set utf8,
+                 key (a,b,c,d,e)) engine=innodb;
+

mysql-test/innodb_gis.test

-source include/have_geometry.inc;
--- source include/have_innodb.inc
+--source include/have_innodb.inc
 SET storage_engine=innodb;
 --source include/gis_generic.inc