summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb.result
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2003-06-12 16:52:36 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2003-06-12 16:52:36 +0300
commit4ac20ad4a925fe9efa4f0937ddeb026cf112857f (patch)
treec4add756e3fc9920bd44b6c481e233ad82d452ac /mysql-test/r/innodb.result
parent9be78a051939fad1f947b14560e016e86263cb63 (diff)
downloadmariadb-git-4ac20ad4a925fe9efa4f0937ddeb026cf112857f.tar.gz
Derived tables bug fix .......
sql/ha_myisam.cc: DISABLE KEYS warnings sql/sql_table.cc: DISABLE KEYS warnings
Diffstat (limited to 'mysql-test/r/innodb.result')
-rw-r--r--mysql-test/r/innodb.result10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 4fb6efe6a14..8409ca59784 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;