diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-05 22:30:01 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-05 22:30:01 +0300 |
| commit | b52317df7105c7b556c030069ff27b134e9a8e26 (patch) | |
| tree | e967558b190a889ad77f62e0f69da4f76c0774f6 /mysql-test/r/subselect.result | |
| parent | 2c95f97c2beea7b88378623d9655fcf2ad88a9a9 (diff) | |
| parent | 19d3f588f2165ed5025fe0b88c856474b913d6b8 (diff) | |
| download | mariadb-git-b52317df7105c7b556c030069ff27b134e9a8e26.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/r/subselect.result')
| -rw-r--r-- | mysql-test/r/subselect.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 25ecb1786e5..a2210fde222 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -1151,7 +1151,7 @@ CREATE TABLE `t1` ( `id` mediumint(8) unsigned NOT NULL auto_increment, `pseudo` varchar(35) character set latin1 NOT NULL default '', PRIMARY KEY (`id`), -UNIQUE KEY `pseudo` (`pseudo`), +UNIQUE KEY `pseudo` (`pseudo`) ) ENGINE=MyISAM PACK_KEYS=1 ROW_FORMAT=DYNAMIC; INSERT INTO t1 (pseudo) VALUES ('test'); SELECT 0 IN (SELECT 1 FROM t1 a); @@ -1256,7 +1256,7 @@ CREATE TABLE `t1` ( `email` varchar(60) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `email` (`email`), -UNIQUE KEY `pseudo` (`pseudo`), +UNIQUE KEY `pseudo` (`pseudo`) ) ENGINE=MyISAM CHARSET=latin1 PACK_KEYS=1 ROW_FORMAT=DYNAMIC; INSERT INTO t1 (id,pseudo,email) VALUES (1,'test','test'),(2,'test1','test1'); SELECT pseudo as a, pseudo as b FROM t1 GROUP BY (SELECT a) ORDER BY (SELECT id*1); |