Commit dec3dff2 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 4399da26 d4eeb4ee

mysql-test/r/fulltext.result

+5 −5
Original line number Diff line number Diff line
@@ -447,12 +447,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;

mysql-test/t/fulltext.test

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,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;

mysql-test/t/type_float.test

+5 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/type_newdecimal.test

+11 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/variables.test

+2 −0
Original line number Diff line number Diff line
@@ -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;