From e462d9107c856ce54be061b7c866f14a9879def9 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Tue, 20 Jul 2004 16:51:30 +0200
Subject: [PATCH] results updated

---
 mysql-test/r/ps_3innodb.result         | 4 ++--
 mysql-test/r/rowid_order_innodb.result | 2 +-
 mysql-test/r/system_mysql_db.result    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index b89daca7128..67a7548b67c 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -567,7 +567,7 @@ def					table	253	64	16	N	1	31	63
 def					type	253	10	3	N	1	31	63
 def					possible_keys	253	4096	0	Y	0	31	63
 def					key	253	64	0	Y	0	31	63
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	0	31	63
 def					ref	253	1024	0	Y	0	31	63
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	44	N	1	31	63
@@ -638,7 +638,7 @@ def					table	253	64	16	N	1	31	63
 def					type	253	10	3	N	1	31	63
 def					possible_keys	253	4096	0	Y	0	31	63
 def					key	253	64	0	Y	0	31	63
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	0	31	63
 def					ref	253	1024	0	Y	0	31	63
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	44	N	1	31	63
diff --git a/mysql-test/r/rowid_order_innodb.result b/mysql-test/r/rowid_order_innodb.result
index c56eb1a5cde..f76002e9cb2 100644
--- a/mysql-test/r/rowid_order_innodb.result
+++ b/mysql-test/r/rowid_order_innodb.result
@@ -14,7 +14,7 @@ insert into t1 values (-5, 1, 1),
 (10, 1, 1);
 explain select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index_merge	key1,key2	key1,key2	5,5	NULL	6	Using sort_union(key1,key2); Using where
+1	SIMPLE	t1	index_merge	key1,key2	key1,key2	5,5	NULL	4	Using sort_union(key1,key2); Using where
 select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
 pk1	key1	key2
 -100	1	1
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result
index 2af2ed40782..2d0daae09be 100644
--- a/mysql-test/r/system_mysql_db.result
+++ b/mysql-test/r/system_mysql_db.result
@@ -134,4 +134,4 @@ columns_priv	CREATE TABLE `columns_priv` (
   PRIMARY KEY  (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Column privileges'
 show tables;
-Tables_in_test
+Tables_in_test	table_type
-- 
2.30.9