Merge lp:~stewart/drizzle/bug578842-max-index-size into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

up the max index size to 1023 from 767. This gives us compatibility with the same index lengths as 3byte utf8 in mysql.

Param-build passes: http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/168/

[Jay Pipes (jaypipes)]

rock.

review: Approve

=== modified file 'plugin/innobase/dict/dict0dict.c'
--- plugin/innobase/dict/dict0dict.c	2010-02-11 03:29:52 +0000
+++ plugin/innobase/dict/dict0dict.c	2010-05-13 06:40:48 +0000
@@ -1740,11 +1740,11 @@
 	if (field->fixed_len > DICT_MAX_INDEX_COL_LEN) {
 		field->fixed_len = 0;
 	}
-#if DICT_MAX_INDEX_COL_LEN != 768
+#if DICT_MAX_INDEX_COL_LEN != 1024
 	/* The comparison limit above must be constant.  If it were
 	changed, the disk format of some fixed-length columns would
 	change, which would be a disaster. */
-# error "DICT_MAX_INDEX_COL_LEN != 768"
+# error "DICT_MAX_INDEX_COL_LEN != 1024"
 #endif
 
 	if (!(col->prtype & DATA_NOT_NULL)) {

=== modified file 'plugin/innobase/include/rem0types.h'
--- plugin/innobase/include/rem0types.h	2009-08-12 06:25:19 +0000
+++ plugin/innobase/include/rem0types.h	2010-05-13 06:40:48 +0000
@@ -41,6 +41,6 @@
 a character may take at most 3 bytes.
 This constant MUST NOT BE CHANGED, or the compatibility of InnoDB data
 files would be at risk! */
-#define REC_MAX_INDEX_COL_LEN	768
+#define REC_MAX_INDEX_COL_LEN	1024
 
 #endif

=== modified file 'plugin/schema_dictionary/tests/r/show.result'
--- plugin/schema_dictionary/tests/r/show.result	2010-03-29 02:01:49 +0000
+++ plugin/schema_dictionary/tests/r/show.result	2010-05-13 06:40:48 +0000
@@ -135,8 +135,6 @@
 KEY `author` (`author_user`),
 KEY `type` (`type_nodetype`)
 )  AUTO_INCREMENT=641;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 DROP TABLE IF EXISTS `nodegroup`;
 Warnings:
 Note	1051	Unknown table 'nodegroup'
@@ -487,7 +485,7 @@
   `dynamicguest_permission` int NOT NULL DEFAULT '-1',
   `group_usergroup` int NOT NULL DEFAULT '-1',
   PRIMARY KEY (`node_id`),
-  KEY `title` (`title`(191),`type_nodetype`),
+  KEY `title` (`title`,`type_nodetype`),
   KEY `author` (`author_user`),
   KEY `type` (`type_nodetype`)
 ) ENGINE=InnoDB

=== modified file 'tests/r/auto_increment.result'
--- tests/r/auto_increment.result	2010-03-09 22:42:17 +0000
+++ tests/r/auto_increment.result	2010-05-13 06:40:48 +0000
@@ -277,8 +277,6 @@
 KEY (t1_name),
 PRIMARY KEY (t1_id)
 ) AUTO_INCREMENT = 1000;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 INSERT INTO t1 (t1_name) VALUES('MySQL');
 INSERT INTO t1 (t1_name) VALUES('MySQL');
 INSERT INTO t1 (t1_name) VALUES('MySQL');
@@ -293,7 +291,7 @@
   `t1_name` varchar(255) DEFAULT NULL,
   `t1_id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`t1_id`),
-  KEY `t1_name` (`t1_name`(191))
+  KEY `t1_name` (`t1_name`)
 ) ENGINE=InnoDB
 DROP TABLE `t1`;
 create table t1(a int not null auto_increment primary key);

=== modified file 'tests/r/ctype_utf8.result'
--- tests/r/ctype_utf8.result	2010-04-05 23:46:43 +0000
+++ tests/r/ctype_utf8.result	2010-05-13 06:40:48 +0000
@@ -136,7 +136,7 @@
 hex(s1)
 drop table t1;
 create table t1 (a text, primary key(a(360))) engine=innodb;
-ERROR 42000: Specified key was too long; max key length is 767 bytes
+ERROR 42000: Specified key was too long; max key length is 1023 bytes
 CREATE TABLE t1 ( a varchar(10) );
 INSERT INTO t1 VALUES ( 'test' );
 SELECT a.a, b.a FROM t1 a, t1 b WHERE a.a = b.a;

=== modified file 'tests/r/drizzledump.result'
--- tests/r/drizzledump.result	2010-03-09 22:42:17 +0000
+++ tests/r/drizzledump.result	2010-05-13 06:40:48 +0000
@@ -1070,8 +1070,6 @@
 key (t1_name),
 primary key (t1_id)
 ) auto_increment = 1000;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 insert into t1 (t1_name) values('bla');
 insert into t1 (t1_name) values('bla');
 insert into t1 (t1_name) values('bla');
@@ -1086,7 +1084,7 @@
   `t1_name` varchar(255) DEFAULT NULL,
   `t1_id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`t1_id`),
-  KEY `t1_name` (`t1_name`(191))
+  KEY `t1_name` (`t1_name`)
 ) ENGINE=InnoDB
 DROP TABLE `t1`;
 select * from t1;
@@ -1100,7 +1098,7 @@
   `t1_name` varchar(255) DEFAULT NULL,
   `t1_id` int NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`t1_id`),
-  KEY `t1_name` (`t1_name`(191))
+  KEY `t1_name` (`t1_name`)
 ) ENGINE=InnoDB
 drop table `t1`;
 #

=== modified file 'tests/r/group_by.result'
--- tests/r/group_by.result	2009-11-13 00:56:59 +0000
+++ tests/r/group_by.result	2010-05-13 06:40:48 +0000
@@ -543,8 +543,6 @@
 primary key (a,b(132),c,d),
 key a (a,b)
 );
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 insert into t2 select 
 x3.a,  -- 3
 concat('val-', x3.a + 3*x4.a), -- 12
@@ -554,7 +552,7 @@
 delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;
 explain select c from t2 where a = 2 and b = 'val-2' group by c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ref	PRIMARY,a	a	770	const,const	36	Using where; Using index
+1	SIMPLE	t2	ref	PRIMARY,a	a	806	const,const	36	Using where; Using index
 select c from t2 where a = 2 and b = 'val-2' group by c;
 c
 val-74

=== modified file 'tests/r/innodb.result'
--- tests/r/innodb.result	2010-04-08 07:20:26 +0000
+++ tests/r/innodb.result	2010-05-13 06:40:48 +0000
@@ -1778,7 +1778,7 @@
 i	10
 alter table t1 modify v varchar(300), drop key v, drop key v_2, add key v (v);
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1787,7 +1787,7 @@
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
-  KEY `v` (`v`(191))
+  KEY `v` (`v`(255))
 ) ENGINE=InnoDB
 select count(*) from t1 where v='a';
 count(*)
@@ -1809,19 +1809,19 @@
 9
 explain select count(*) from t1 where v='a  ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	#	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	#	Using where
 explain select count(*) from t1 where v like 'a%';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	#	Using where
+1	SIMPLE	t1	range	v	v	1023	NULL	#	Using where
 explain select count(*) from t1 where v between 'a' and 'a ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	#	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	#	Using where
 explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	#	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	#	Using where
 explain select * from t1 where v='a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	#	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	#	Using where
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a
	1
@@ -1940,7 +1940,7 @@
 i	10
 alter table t1 modify v varchar(600), drop key v, add key v (v);
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1949,7 +1949,7 @@
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
-  KEY `v` (`v`(191))
+  KEY `v` (`v`(255))
 ) ENGINE=InnoDB
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
@@ -2061,7 +2061,7 @@
 drop table t1;
 create table t1 (v varchar(16383), key(v));
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 drop table t1;
 create table t1 (v varchar(16383));
 show create table t1;
@@ -2175,15 +2175,13 @@
 create table t1 (col1 varchar(2000), index (col1(767)))
 engine = innodb;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 create table t2 (col1 char(255), index (col1))
 engine = innodb;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 create table t4 (col1 varchar(767), index (col1))
 engine = innodb;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 create table t5 (col1 varchar(190) primary key)
 engine = innodb;
 create table t6 (col1 varbinary(254) primary key)
@@ -2191,57 +2189,53 @@
 create table t7 (col1 text, index(col1(767)))
 engine = innodb;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 create table t8 (col1 blob, index(col1(767)))
 engine = innodb;
 create table t9 (col1 varchar(512), col2 varchar(512), index(col1, col2))
 engine = innodb;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 show create table t9;
 Table	Create Table
 t9	CREATE TABLE `t9` (
   `col1` varchar(512) DEFAULT NULL,
   `col2` varchar(512) DEFAULT NULL,
-  KEY `col1` (`col1`(191),`col2`(191))
+  KEY `col1` (`col1`(255),`col2`(255))
 ) ENGINE=InnoDB
 drop table t1, t2, t4, t5, t6, t7, t8, t9;
 create table t1 (col1 varchar(768), index(col1))
 engine = innodb;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 create table t2 (col1 varbinary(768), index(col1))
 engine = innodb;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 create table t3 (col1 text, index(col1(768)))
 engine = innodb;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 create table t4 (col1 blob, index(col1(768)))
 engine = innodb;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` varchar(768) DEFAULT NULL,
-  KEY `col1` (`col1`(191))
+  KEY `col1` (`col1`(255))
 ) ENGINE=InnoDB
 drop table t1, t2, t3, t4;
 create table t1 (col1 varchar(768) primary key)
 engine = innodb;
-ERROR 42000: Specified key was too long; max key length is 767 bytes
-create table t2 (col1 varbinary(768) primary key)
+ERROR 42000: Specified key was too long; max key length is 1023 bytes
+create table t2 (col1 varbinary(1024) primary key)
 engine = innodb;
-ERROR 42000: Specified key was too long; max key length is 767 bytes
+ERROR 42000: Specified key was too long; max key length is 1023 bytes
 create table t3 (col1 text, primary key(col1(768)))
 engine = innodb;
-ERROR 42000: Specified key was too long; max key length is 767 bytes
-create table t4 (col1 blob, primary key(col1(768)))
+ERROR 42000: Specified key was too long; max key length is 1023 bytes
+create table t4 (col1 blob, primary key(col1(1024)))
 engine = innodb;
-ERROR 42000: Specified key was too long; max key length is 767 bytes
+ERROR 42000: Specified key was too long; max key length is 1023 bytes
 CREATE TABLE t1
 (
 id INT PRIMARY KEY
@@ -2311,12 +2305,7 @@
 b varchar(255),
 c varchar(255),
 d varchar(255),
-key (a,b,c,d)) engine=innodb;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
-Warning	1071	Specified key was too long; max key length is 767 bytes
-Warning	1071	Specified key was too long; max key length is 767 bytes
-Warning	1071	Specified key was too long; max key length is 767 bytes
+key (a(200),b(200),c(200),d(200))) engine=innodb;
 drop table t1;
 create table t1 (a varchar(255),
 b varchar(255),
@@ -2632,8 +2621,6 @@
 CONSTRAINT t_fk FOREIGN KEY (a) REFERENCES t1 (a) 
 ON DELETE CASCADE
 ) ENGINE=INNODB;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1, 'bar', 'vbar');
 INSERT INTO t2 VALUES (1, 'BAR2', 'VBAR');

=== modified file 'tests/r/innodb_mysql.result'
--- tests/r/innodb_mysql.result	2010-03-02 16:42:01 +0000
+++ tests/r/innodb_mysql.result	2010-05-13 06:40:48 +0000
@@ -639,7 +639,7 @@
 drop table t1,t2;
 create table t1(f1 varchar(800) not null, key(f1));
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 insert into t1 values('aaa');
 drop table t1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c FLOAT, KEY b(b)) ENGINE = INNODB;
@@ -944,12 +944,12 @@
 insert into t1 values('aaa');
 alter table t1 add index(a(1024));
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` text,
-  KEY `a` (`a`(191))
+  KEY `a` (`a`(255))
 ) ENGINE=InnoDB
 drop table t1;
 CREATE TABLE t1 (

=== modified file 'tests/r/randgen_queries.result'
--- tests/r/randgen_queries.result	2010-04-05 20:46:02 +0000
+++ tests/r/randgen_queries.result	2010-05-13 06:40:48 +0000
@@ -42,9 +42,6 @@
 key (`col_char_not_null_key` ),
 key (`col_text_key`  (255)),
 key (`col_enum_key` )) ENGINE=innodb;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
-Warning	1071	Specified key was too long; max key length is 767 bytes
 set AUTOCOMMIT=OFF;
 select table_schema, 
 table_name, 

=== modified file 'tests/r/subselect.result'
--- tests/r/subselect.result	2009-12-15 16:55:05 +0000
+++ tests/r/subselect.result	2010-05-13 06:40:48 +0000
@@ -3964,8 +3964,6 @@
 a varchar(255) default NULL,
 b timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
 INDEX idx(a,b));
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 CREATE TABLE t2 (
 a varchar(255) default NULL);
 INSERT INTO t1 VALUES ('abcdefghijk','2007-05-07 06:00:24');

=== modified file 'tests/r/type_blob.result'
--- tests/r/type_blob.result	2010-03-02 01:04:20 +0000
+++ tests/r/type_blob.result	2010-05-13 06:40:48 +0000
@@ -335,15 +335,15 @@
 hello	1
 drop table t1;
 create table t1 (a text, unique (a(2100)));
-ERROR 42000: Specified key was too long; max key length is 767 bytes
+ERROR 42000: Specified key was too long; max key length is 1023 bytes
 create table t1 (a text, key (a(2100)));
 Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` text,
-  KEY `a` (`a`(191))
+  KEY `a` (`a`(255))
 ) ENGINE=DEFAULT
 drop table t1;
 CREATE TABLE t1 (

=== modified file 'tests/r/type_varchar.result'
--- tests/r/type_varchar.result	2009-10-31 18:12:20 +0000
+++ tests/r/type_varchar.result	2010-05-13 06:40:48 +0000
@@ -38,8 +38,6 @@
 alter table t1 add primary key (v);
 drop table t1;
 create table t1 (v varchar(254), index (v));
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 insert into t1 values ("This is a test ");
 insert into t1 values ("Some sample data");
 insert into t1 values (" garbage ");
@@ -72,13 +70,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1019	NULL	3	Using where; Using index
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1019	const	3	Using where; Using index
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1019	NULL	3	Using where; Using index
 alter table t1 change v v varchar(255);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -96,14 +94,16 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using index
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where; Using index
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using index
 alter table t1 change v v varchar(256);
+Warnings:
+Warning	1071	Specified key was too long; max key length is 1023 bytes
 select * from t1 where v like 'This is a test' order by v;
 v
 This is a test
@@ -120,13 +120,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 alter table t1 change v v varchar(257);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -144,13 +144,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 alter table t1 change v v varchar(258);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -168,13 +168,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 alter table t1 change v v varchar(259);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -192,13 +192,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 alter table t1 change v v varchar(258);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -216,13 +216,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 alter table t1 change v v varchar(257);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -240,13 +240,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 alter table t1 change v v varchar(256);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -264,13 +264,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using filesort
 alter table t1 change v v varchar(255);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -288,13 +288,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using index
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1023	const	3	Using where; Using index
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1023	NULL	3	Using where; Using index
 alter table t1 change v v varchar(254);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -312,13 +312,13 @@
 Some samples
 explain select * from t1 where v like 'This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1019	NULL	3	Using where; Using index
 explain select * from t1 where v='This is a test' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	767	const	3	Using where
+1	SIMPLE	t1	ref	v	v	1019	const	3	Using where; Using index
 explain select * from t1 where v like 'S%' order by v;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	v	v	767	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	1019	NULL	3	Using where; Using index
 alter table t1 change v v varchar(253);
 alter table t1 change v v varchar(254), drop key v;
 alter table t1 change v v varchar(300), add key (v(10));

=== modified file 'tests/r/union.result'
--- tests/r/union.result	2010-04-20 18:23:07 +0000
+++ tests/r/union.result	2010-05-13 06:40:48 +0000
@@ -232,8 +232,6 @@
 PRIMARY KEY  (cid),
 KEY cap (cap)
 ) ;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 CREATE TABLE t3 (
 gid int NOT NULL auto_increment,
 gn varchar(255) NOT NULL default '',
@@ -241,8 +239,6 @@
 PRIMARY KEY  (gid),
 KEY gn (gn)
 ) ;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 INSERT INTO t3 VALUES (1,'V1',NULL);
 CREATE TABLE t4 (
 uid bigint NOT NULL default '0',
@@ -262,8 +258,6 @@
 PRIMARY KEY  (rid),
 KEY rl (rl)
 ) ;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
 CREATE TABLE t6 (
 uid bigint NOT NULL auto_increment,
 un varchar(190) NOT NULL default '',

=== modified file 'tests/t/innodb.test'
--- tests/t/innodb.test	2010-04-08 07:20:26 +0000
+++ tests/t/innodb.test	2010-05-13 06:40:48 +0000
@@ -1264,13 +1264,13 @@
 create table t1 (col1 varchar(768) primary key)
  engine = innodb;
 --error 1071
-create table t2 (col1 varbinary(768) primary key)
+create table t2 (col1 varbinary(1024) primary key)
  engine = innodb;
 --error 1071
 create table t3 (col1 text, primary key(col1(768)))
  engine = innodb;
 --error 1071
-create table t4 (col1 blob, primary key(col1(768)))
+create table t4 (col1 blob, primary key(col1(1024)))
  engine = innodb;
 
 #
@@ -1374,7 +1374,7 @@
                  b varchar(255),
                  c varchar(255),
                  d varchar(255),
-                 key (a,b,c,d)) engine=innodb;
+                 key (a(200),b(200),c(200),d(200))) engine=innodb;
 drop table t1;
 --error ER_TOO_LONG_KEY
 create table t1 (a varchar(255),