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

1 files changed, 5 insertions, 5 deletions

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;