diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-12-02 14:00:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-12-02 14:00:12 +0200 |
| commit | aae5fed3b89c27d2a67626089326e71090a27b90 (patch) | |
| tree | bc415efc4263a0dc4e84f822395daca4feea9f68 /mysql-test | |
| parent | d6f65873956a9424a7cb954d50729e0becffbd8f (diff) | |
| parent | 858eef452fd1c32bbbf672720043ddcedf6095ce (diff) | |
| download | mariadb-git-aae5fed3b89c27d2a67626089326e71090a27b90.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ps.result | 14 | ||||
| -rw-r--r-- | mysql-test/t/count_distinct3.test | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 994c375da83..bc3d2a6108c 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -337,7 +337,7 @@ set @precision=10000000000; select rand(), cast(rand(10)*@precision as unsigned integer) from t1; rand() cast(rand(10)*@precision as unsigned integer) -- 6570515219 +- 6570515220 - 1282061302 - 6698761160 - 9647622201 @@ -348,23 +348,23 @@ prepare stmt from set @var=1; execute stmt using @var; rand() cast(rand(10)*@precision as unsigned integer) cast(rand(?)*@precision as unsigned integer) -- 6570515219 - +- 6570515220 - - 1282061302 - - 6698761160 - - 9647622201 - set @var=2; execute stmt using @var; rand() cast(rand(10)*@precision as unsigned integer) cast(rand(?)*@precision as unsigned integer) -- 6570515219 6555866465 -- 1282061302 1223466192 -- 6698761160 6449731873 +- 6570515220 6555866465 +- 1282061302 1223466193 +- 6698761160 6449731874 - 9647622201 8578261098 set @var=3; execute stmt using @var; rand() cast(rand(10)*@precision as unsigned integer) cast(rand(?)*@precision as unsigned integer) -- 6570515219 9057697559 +- 6570515220 9057697560 - 1282061302 3730790581 -- 6698761160 1480860534 +- 6698761160 1480860535 - 9647622201 6211931236 drop table t1; deallocate prepare stmt; diff --git a/mysql-test/t/count_distinct3.test b/mysql-test/t/count_distinct3.test index 52a4f271dac..f817b2c635d 100644 --- a/mysql-test/t/count_distinct3.test +++ b/mysql-test/t/count_distinct3.test @@ -17,7 +17,7 @@ while ($1) SET @rnd= RAND(); SET @id = CAST(@rnd * @rnd_max AS UNSIGNED); SET @id_rev= @rnd_max - @id; - SET @grp= CAST(128.0 * @rnd AS UNSIGNED); + SET @grp= CAST(127.0 * @rnd AS UNSIGNED); INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev); dec $1; } |