diff options
| author | unknown <serg@serg.mysql.com> | 2003-01-28 00:55:41 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-01-28 00:55:41 +0100 |
| commit | 0d470b8d7723629776609892e4fc400b17ad8359 (patch) | |
| tree | 15a7b5601b010be414ee68b5a604b38637aeb057 /mysql-test/r | |
| parent | 48f587a8836bd0b4a8e98bc87a9b98133b58fef5 (diff) | |
| download | mariadb-git-0d470b8d7723629776609892e4fc400b17ad8359.tar.gz | |
do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
and VERSION() to be uppercase in e.g. "select pi()"
mysql-test/r/func_math.result:
result updated
mysql-test/r/select_found.result:
result updated
mysql-test/r/union.result:
result updated
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_math.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/select_found.result | 14 | ||||
| -rw-r--r-- | mysql-test/r/union.result | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 811a16fff6c..d6596e51db4 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -36,7 +36,7 @@ select rand(999999),rand(); rand(999999) rand() 0.014231365187309 0.028870999839968 select pi(),sin(pi()/2),cos(pi()/2),abs(tan(pi())),cot(1),asin(1),acos(0),atan(1); -PI() sin(pi()/2) cos(pi()/2) abs(tan(pi())) cot(1) asin(1) acos(0) atan(1) +pi() sin(pi()/2) cos(pi()/2) abs(tan(pi())) cot(1) asin(1) acos(0) atan(1) 3.141593 1.000000 0.000000 0.000000 0.64209262 1.570796 1.570796 0.785398 select degrees(pi()),radians(360); degrees(pi()) radians(360) diff --git a/mysql-test/r/select_found.result b/mysql-test/r/select_found.result index 1c2cd7da894..0a7f464cf7b 100644 --- a/mysql-test/r/select_found.result +++ b/mysql-test/r/select_found.result @@ -12,43 +12,43 @@ a b 7 7 8 9 select found_rows(); -FOUND_ROWS() +found_rows() 8 select SQL_CALC_FOUND_ROWS * from t1 limit 1; a b 1 2 select found_rows(); -FOUND_ROWS() +found_rows() 8 select SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS * from t1 limit 1; a b 1 2 select found_rows(); -FOUND_ROWS() +found_rows() 8 select SQL_CALC_FOUND_ROWS * from t1 order by b desc limit 1; a b 8 9 select found_rows(); -FOUND_ROWS() +found_rows() 8 select SQL_CALC_FOUND_ROWS distinct b from t1 limit 1; b 2 select found_rows(); -FOUND_ROWS() +found_rows() 6 select SQL_CALC_FOUND_ROWS b,count(*) as c from t1 group by b order by c desc limit 1; b c 5 3 select found_rows(); -FOUND_ROWS() +found_rows() 6 select SQL_CALC_FOUND_ROWS * from t1 left join t1 as t2 on (t1.b=t2.a) limit 2,1; a b a b 3 5 5 5 select found_rows(); -FOUND_ROWS() +found_rows() 8 drop table t1; create table t1 (a int not null primary key); diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 896901dd8af..2af9d5a3584 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -94,7 +94,7 @@ a b 1 a 2 b select found_rows(); -FOUND_ROWS() +found_rows() 6 explain select a,b from t1 union all select a,b from t2; table type possible_keys key key_len ref rows Extra |