Update test results. type_varchar changed because the size of the

key now gets changed along with the size of the field as long
as the original key had the same length as the length of the field
(or is unspecified originally, as in the test).


mysql-test/r/heap.result:
  Update results
mysql-test/r/type_varchar.result:
  Update results

2 files changed, 28 insertions, 28 deletions

diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
index 52bf99d45ea..22304c4a93d 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/r/heap.result
@@ -699,5 +699,5 @@ ERROR 42000: Incorrect table definition; there can be only one auto column and i
 create table t1 (c char(255), primary key(c(90)));
 insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
 insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
-ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1
+ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1
 drop table t1;
diff --git a/mysql-test/r/type_varchar.result b/mysql-test/r/type_varchar.result
index fed03cd8d71..e3b12cc36e3 100644
--- a/mysql-test/r/type_varchar.result
+++ b/mysql-test/r/type_varchar.result
@@ -126,13 +126,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	258	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	258	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	258	NULL	2	Using where; Using index
 alter table t1 change v v varchar(256);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -150,13 +150,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	259	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	259	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	259	NULL	2	Using where; Using index
 alter table t1 change v v varchar(257);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -174,13 +174,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	260	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	260	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	260	NULL	2	Using where; Using index
 alter table t1 change v v varchar(258);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -198,13 +198,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	261	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	261	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	261	NULL	2	Using where; Using index
 alter table t1 change v v varchar(259);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -222,13 +222,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	262	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	262	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	262	NULL	2	Using where; Using index
 alter table t1 change v v varchar(258);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -246,13 +246,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	261	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	261	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	261	NULL	2	Using where; Using index
 alter table t1 change v v varchar(257);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -270,13 +270,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	260	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	260	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	260	NULL	2	Using where; Using index
 alter table t1 change v v varchar(256);
 select * from t1 where v like 'This is a test' order by v;
 v
@@ -294,13 +294,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	259	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	259	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	259	NULL	2	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
@@ -318,13 +318,13 @@ Some sample data
 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	257	NULL	3	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	258	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	257	const	3	Using where
+1	SIMPLE	t1	ref	v	v	258	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	257	NULL	2	Using where; Using filesort
+1	SIMPLE	t1	range	v	v	258	NULL	2	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