diff options
author | ramil@mysql.com <> | 2005-03-03 14:29:37 +0400 |
---|---|---|
committer | ramil@mysql.com <> | 2005-03-03 14:29:37 +0400 |
commit | de1153b5e6be47fcbc02a043d6fb066cf93dc76f (patch) | |
tree | fa61b1ad2630dd81411a79456d348eb56a704ca7 /mysql-test/r/ps.result | |
parent | 29ea973a57c2f28bc06bb10f88a12c46ec5b74d2 (diff) | |
parent | 89d44e039e202e18fd4f272eeefdcb5336397498 (diff) | |
download | mariadb-git-de1153b5e6be47fcbc02a043d6fb066cf93dc76f.tar.gz |
manual merge
Diffstat (limited to 'mysql-test/r/ps.result')
-rw-r--r-- | mysql-test/r/ps.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 7d008c6e753..51fadd48184 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -487,3 +487,15 @@ insert into t1 values ('foo'); prepare stmt FROM 'SELECT char_length (a) FROM t1'; ERROR 42000: FUNCTION test.char_length does not exist drop table t1; +prepare stmt from "SELECT SQL_CALC_FOUND_ROWS 'foo' UNION SELECT 'bar' LIMIT 0"; +execute stmt; +foo +SELECT FOUND_ROWS(); +FOUND_ROWS() +2 +execute stmt; +foo +SELECT FOUND_ROWS(); +FOUND_ROWS() +2 +deallocate prepare stmt; |