diff options
author | unknown <msvensson@neptunus.(none)> | 2006-03-22 16:48:35 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-03-22 16:48:35 +0100 |
commit | 7e78842adfece3314e809c09f62cbfa018e3cae5 (patch) | |
tree | 9cfe8e5f63a4b3a48630094199de84f94d20876d | |
parent | 0adda6df52f00ddd9533bd956f39bbf9ef80360e (diff) | |
parent | d4eeb4eefdbb8ccfc2b7a22e5dd53efda8ff31a6 (diff) | |
download | mariadb-git-7e78842adfece3314e809c09f62cbfa018e3cae5.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
-rw-r--r-- | mysql-test/r/fulltext.result | 10 | ||||
-rw-r--r-- | mysql-test/t/fulltext.test | 2 | ||||
-rw-r--r-- | mysql-test/t/type_float.test | 5 | ||||
-rw-r--r-- | mysql-test/t/type_newdecimal.test | 11 | ||||
-rw-r--r-- | mysql-test/t/variables.test | 2 |
5 files changed, 24 insertions, 6 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index d5af37c0fec..fe86f20fe22 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -460,12 +460,12 @@ t1 CREATE TABLE `t1` ( DROP TABLE t1; CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a)); INSERT INTO t1 VALUES('test'),('test1'),('test'); -PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')"; +PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE MATCH(a) AGAINST('test1 test')"; EXECUTE stmt; -a MATCH(a) AGAINST('test1 test') -test1 0.68526661396027 +a FORMAT(MATCH(a) AGAINST('test1 test'),6) +test1 0.685267 EXECUTE stmt; -a MATCH(a) AGAINST('test1 test') -test1 0.68526661396027 +a FORMAT(MATCH(a) AGAINST('test1 test'),6) +test1 0.685267 DEALLOCATE PREPARE stmt; DROP TABLE t1; diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index 7b7ed2c1707..626f5f2b81c 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -383,7 +383,7 @@ DROP TABLE t1; # CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a)); INSERT INTO t1 VALUES('test'),('test1'),('test'); -PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')"; +PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE MATCH(a) AGAINST('test1 test')"; EXECUTE stmt; EXECUTE stmt; DEALLOCATE PREPARE stmt; diff --git a/mysql-test/t/type_float.test b/mysql-test/t/type_float.test index d223c315735..5bfd744e4a8 100644 --- a/mysql-test/t/type_float.test +++ b/mysql-test/t/type_float.test @@ -116,10 +116,15 @@ drop table if exists t1; # Check conversion of floats to character field (Bug #7774) create table t1 (c char(20)); insert into t1 values (5e-28); +# Expected result is "5e-28", but windows returns "5e-028" +--replace_result 5e-028 5e-28 select * from t1; drop table t1; create table t1 (c char(6)); insert into t1 values (2e5),(2e6),(2e-4),(2e-5); +# Expected result is "2e+06", but windows returns "2e+006" +# Expected result is "2e-05", but windows returns "2e-005" +--replace_result 2e+006 2e+06 2e-005 2e-05 select * from t1; drop table t1; diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/t/type_newdecimal.test index e2fe9767432..47b8bf64d66 100644 --- a/mysql-test/t/type_newdecimal.test +++ b/mysql-test/t/type_newdecimal.test @@ -1050,7 +1050,18 @@ while ($max_power) } SELECT my_float, my_double, my_varchar FROM t1; +# Expected result 0.000000000011754943372854760000 +# On windows we get 0.000000000011754943372854770000 +# use replace_result to correct it +--replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000 + SELECT CAST(my_float AS DECIMAL(65,30)), my_float FROM t1; + +# Expected result 0.000000000011754943372854760000 +# On windows we get 0.000000000011754943372854770000 +# use replace_result to correct it +--replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000 + SELECT CAST(my_double AS DECIMAL(65,30)), my_double FROM t1; SELECT CAST(my_varchar AS DECIMAL(65,30)), my_varchar FROM t1; diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index dd645cd1d40..649265dcc5e 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -20,6 +20,8 @@ select @test, @`test`, @TEST, @`TEST`, @"teSt"; set @select=2,@t5=1.23456; select @`select`,@not_used; set @test_int=10,@test_double=1e-10,@test_string="abcdeghi",@test_string2="abcdefghij",@select=NULL; +# Expected result "1e-10", windows returns "1e-010" +--replace_result 1e-010 1e-10 select @test_int,@test_double,@test_string,@test_string2,@select; set @test_int="hello",@test_double="hello",@test_string="hello",@test_string2="hello"; select @test_int,@test_double,@test_string,@test_string2; |