diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-18 20:02:27 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-18 20:02:27 +0500 |
commit | caf045dbeb1e251732d049bb476c75d3175daaf2 (patch) | |
tree | 0dedf8bbe03f29d6bb8dd4cdf3452a45c38a575e /mysql-test/r/ps.result | |
parent | 867d3460990c3704f79ff37f2b26f2976e92875b (diff) | |
parent | 507ad360d785e5f0afc42f27df27b09bb7a129b8 (diff) | |
download | mariadb-git-caf045dbeb1e251732d049bb476c75d3175daaf2.tar.gz |
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ps.result')
-rw-r--r-- | mysql-test/r/ps.result | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 96abff8d7f6..8a10a52ee65 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -1114,6 +1114,28 @@ execute stmt; show create table t1; drop table t1; deallocate prepare stmt; +CREATE TABLE t1(a int); +INSERT INTO t1 VALUES (2), (3), (1); +PREPARE st1 FROM +'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'; +EXECUTE st1; +a +1 +2 +3 +11 +12 +13 +EXECUTE st1; +a +1 +2 +3 +11 +12 +13 +DEALLOCATE PREPARE st1; +DROP TABLE t1; End of 4.1 tests. create table t1 (a varchar(20)); insert into t1 values ('foo'); |