Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a8ba8a30
Commit
a8ba8a30
authored
Mar 22, 2006
by
lars@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
parents
c07b9184
123f5135
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
6 deletions
+24
-6
mysql-test/r/fulltext.result
mysql-test/r/fulltext.result
+5
-5
mysql-test/t/fulltext.test
mysql-test/t/fulltext.test
+1
-1
mysql-test/t/type_float.test
mysql-test/t/type_float.test
+5
-0
mysql-test/t/type_newdecimal.test
mysql-test/t/type_newdecimal.test
+11
-0
mysql-test/t/variables.test
mysql-test/t/variables.test
+2
-0
No files found.
mysql-test/r/fulltext.result
View file @
a8ba8a30
...
...
@@ -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.68526
66139602
7
a
FORMAT(MATCH(a) AGAINST('test1 test'),6
)
test1 0.685267
EXECUTE stmt;
a
MATCH(a) AGAINST('test1 test'
)
test1 0.68526
66139602
7
a
FORMAT(MATCH(a) AGAINST('test1 test'),6
)
test1 0.685267
DEALLOCATE PREPARE stmt;
DROP TABLE t1;
mysql-test/t/fulltext.test
View file @
a8ba8a30
...
...
@@ -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
;
...
...
mysql-test/t/type_float.test
View file @
a8ba8a30
...
...
@@ -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
(
5
e
-
28
);
# Expected result is "5e-28", but windows returns "5e-028"
--
replace_result
5
e
-
02
8
5
e
-
28
select
*
from
t1
;
drop
table
t1
;
create
table
t1
(
c
char
(
6
));
insert
into
t1
values
(
2
e5
),(
2
e6
),(
2
e
-
4
),(
2
e
-
5
);
# Expected result is "2e+06", but windows returns "2e+006"
# Expected result is "2e-05", but windows returns "2e-005"
--
replace_result
2
e
+
006
2
e
+
06
2
e
-
005
2
e
-
05
select
*
from
t1
;
drop
table
t1
;
...
...
mysql-test/t/type_newdecimal.test
View file @
a8ba8a30
...
...
@@ -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
View file @
a8ba8a30
...
...
@@ -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
=
1
e
-
10
,
@
test_string
=
"abcdeghi"
,
@
test_string2
=
"abcdefghij"
,
@
select
=
NULL
;
# Expected result "1e-10", windows returns "1e-010"
--
replace_result
1
e
-
010
1
e
-
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment