diff options
author | unknown <msvensson@neptunus.(none)> | 2005-03-30 14:32:53 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-03-30 14:32:53 +0200 |
commit | f17bba4e2d93fe8343bc1230ef9ef2248cd80246 (patch) | |
tree | 6d4d58f868c686f29d5acf8aefd03ffdf2bb27cf /mysql-test/r/ps_7ndb.result | |
parent | 8d8cb24efb8dd763c44bbf7b97dfe719e0550023 (diff) | |
parent | ed4022bdd165ca4da93e0d3f7520819b1e10fe00 (diff) | |
download | mariadb-git-f17bba4e2d93fe8343bc1230ef9ef2248cd80246.tar.gz |
Merge
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item.cc:
SCCS merged
Diffstat (limited to 'mysql-test/r/ps_7ndb.result')
-rw-r--r-- | mysql-test/r/ps_7ndb.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/r/ps_7ndb.result index 01214d3dfe8..ec8c47031c1 100644 --- a/mysql-test/r/ps_7ndb.result +++ b/mysql-test/r/ps_7ndb.result @@ -768,6 +768,10 @@ prepare stmt1 from ' select a, ?, b FROM t1 outer_table where execute stmt1 using @arg00, @arg01, @arg02, @arg03 ; a ? b 2 1 two +prepare stmt1 from 'select c4 FROM t9 where + c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ; +execute stmt1 using @arg01, @arg02; +c4 prepare stmt1 from ' select a, b FROM t1 outer_table where a = (select a from t1 where b = outer_table.b ) order by a '; execute stmt1 ; |