summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormonty@mishka.local <>2005-07-19 19:28:26 +0300
committermonty@mishka.local <>2005-07-19 19:28:26 +0300
commit29d9aa65f3d549dd86d7c3a8771cc784b5f0010c (patch)
tree705bbf9e055818dc51b13b706b586eb1e84d8bb4 /mysql-test
parentc9abae2ce2b2bea4f3bfc338effda6b5e93f12f3 (diff)
parent7e83d09ce72e27266eb8f6deababd172c20bbfb6 (diff)
downloadmariadb-git-29d9aa65f3d549dd86d7c3a8771cc784b5f0010c.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/select.result19
-rw-r--r--mysql-test/t/select.test7
2 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 2df60944999..993fe7d22f1 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2594,7 +2594,26 @@ INSERT INTO t1
SELECT 50, 3, 3 FROM DUAL
WHERE NOT EXISTS
(SELECT * FROM t1 WHERE a = 50 AND b = 3);
+select found_rows();
+found_rows()
+0
SELECT * FROM t1;
a b c
50 3 3
+select count(*) from t1;
+count(*)
+1
+select found_rows();
+found_rows()
+1
+select count(*) from t1 limit 2,3;
+count(*)
+select found_rows();
+found_rows()
+0
+select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;
+count(*)
+select found_rows();
+found_rows()
+1
DROP TABLE t1;
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 893b9ba9267..3ae5839cd3c 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -2153,6 +2153,13 @@ INSERT INTO t1
SELECT 50, 3, 3 FROM DUAL
WHERE NOT EXISTS
(SELECT * FROM t1 WHERE a = 50 AND b = 3);
+select found_rows();
SELECT * FROM t1;
+select count(*) from t1;
+select found_rows();
+select count(*) from t1 limit 2,3;
+select found_rows();
+select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;
+select found_rows();
DROP TABLE t1;