1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
This commit is contained in:
unknown 2004-08-24 09:33:05 +03:00
commit 2f16033f2f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/innodb.result
View File

@ -1376,7 +1376,7 @@ CREATE TABLE t1 (
`id` int(10) unsigned NOT NULL auto_increment, `id` int(10) unsigned NOT NULL auto_increment,
`id_object` int(10) unsigned default '0', `id_object` int(10) unsigned default '0',
`id_version` int(10) unsigned NOT NULL default '1', `id_version` int(10) unsigned NOT NULL default '1',
label varchar(100) NOT NULL default '', `label` varchar(100) NOT NULL default '',
`description` text, `description` text,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `id_object` (`id_object`), KEY `id_object` (`id_object`),
@ -1390,8 +1390,8 @@ PRIMARY KEY (`id`),
KEY `id_version` (`id_version`) KEY `id_version` (`id_version`)
) ENGINE=InnoDB; ) ENGINE=InnoDB;
INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9"); INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
SELECT t2.id, t1.label FROM t2 INNER JOIN 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 (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); ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
id label id label
3382 Test 3382 Test

6
mysql-test/t/innodb.test
View File

@ -998,7 +998,7 @@ CREATE TABLE t1 (
`id` int(10) unsigned NOT NULL auto_increment, `id` int(10) unsigned NOT NULL auto_increment,
`id_object` int(10) unsigned default '0', `id_object` int(10) unsigned default '0',
`id_version` int(10) unsigned NOT NULL default '1', `id_version` int(10) unsigned NOT NULL default '1',
label varchar(100) NOT NULL default '', `label` varchar(100) NOT NULL default '',
`description` text, `description` text,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `id_object` (`id_object`), KEY `id_object` (`id_object`),
@ -1016,8 +1016,8 @@ CREATE TABLE t2 (
INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9"); INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
SELECT t2.id, t1.label FROM t2 INNER JOIN 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 (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); ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
drop table t1,t2; drop table t1,t2;