Merge

mysql-test/r/innodb.result:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/table.h:
  Auto merged

2 files changed, 6 insertions, 6 deletions

diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index 5f405d83fa5..61937ba9266 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@@ -137,7 +137,7 @@ a	t
 explain select count(*) from t1 as tt1, (select * from t1) as tt2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
-2	DERIVED	tt1	index	NULL	a	4	NULL	10000	Using index
+2	DERIVED	tt1	ALL	NULL	NULL	NULL	NULL	10000	
 drop table t1;
 SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b;
 (SELECT * FROM (SELECT 1 as a) as a )
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 4d5a6094ec3..523862052e0 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1322,10 +1322,10 @@ SELECT t2.id, t1.label FROM t2 INNER JOIN
 (SELECT t1.id_object as id_object FROM t1 WHERE t1.label LIKE '%test%') AS lbl 
 ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
 id	label
-3382	Fournisseur Test
-102	Fournisseur Test
-1794	Fournisseur Test
-1822	Fournisseur Test
-3524	Fournisseur Test
+3382	Test
+102	Le Pekin (Test)
+1794	Test de resto
+1822	Test 3
+3524	Societe Test
 3525	Fournisseur Test
 drop table t1,t2;