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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a37e4311
Commit
a37e4311
authored
Mar 27, 2009
by
Alexey Kopytov
Browse files
Options
Browse Files
Download
Plain Diff
Automerge.
parents
2005f3c7
afb2b6de
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
54 additions
and
14 deletions
+54
-14
mysql-test/r/union.result
mysql-test/r/union.result
+12
-0
mysql-test/t/union.test
mysql-test/t/union.test
+15
-0
sql/field.cc
sql/field.cc
+3
-3
sql/item.cc
sql/item.cc
+19
-11
sql/mysql_priv.h
sql/mysql_priv.h
+5
-0
No files found.
mysql-test/r/union.result
View file @
a37e4311
...
@@ -1506,4 +1506,16 @@ DESC t6;
...
@@ -1506,4 +1506,16 @@ DESC t6;
Field Type Null Key Default Extra
Field Type Null Key Default Extra
NULL int(11) YES NULL
NULL int(11) YES NULL
DROP TABLE t1, t2, t3, t4, t5, t6;
DROP TABLE t1, t2, t3, t4, t5, t6;
CREATE TABLE t1 (f FLOAT(9,6));
CREATE TABLE t2 AS SELECT f FROM t1 UNION SELECT f FROM t1;
SHOW FIELDS FROM t2;
Field Type Null Key Default Extra
f float(9,6) YES NULL
DROP TABLE t1, t2;
CREATE TABLE t1(d DOUBLE(9,6));
CREATE TABLE t2 AS SELECT d FROM t1 UNION SELECT d FROM t1;
SHOW FIELDS FROM t2;
Field Type Null Key Default Extra
d double(9,6) YES NULL
DROP TABLE t1, t2;
End of 5.0 tests
End of 5.0 tests
mysql-test/t/union.test
View file @
a37e4311
...
@@ -1023,4 +1023,19 @@ SELECT * FROM (SELECT * FROM (SELECT NULL)a) b UNION SELECT a FROM t1;
...
@@ -1023,4 +1023,19 @@ SELECT * FROM (SELECT * FROM (SELECT NULL)a) b UNION SELECT a FROM t1;
DESC
t6
;
DESC
t6
;
DROP
TABLE
t1
,
t2
,
t3
,
t4
,
t5
,
t6
;
DROP
TABLE
t1
,
t2
,
t3
,
t4
,
t5
,
t6
;
#
# Bug #43432: Union on floats does unnecessary rounding
#
CREATE
TABLE
t1
(
f
FLOAT
(
9
,
6
));
CREATE
TABLE
t2
AS
SELECT
f
FROM
t1
UNION
SELECT
f
FROM
t1
;
SHOW
FIELDS
FROM
t2
;
DROP
TABLE
t1
,
t2
;
CREATE
TABLE
t1
(
d
DOUBLE
(
9
,
6
));
CREATE
TABLE
t2
AS
SELECT
d
FROM
t1
UNION
SELECT
d
FROM
t1
;
SHOW
FIELDS
FROM
t2
;
DROP
TABLE
t1
,
t2
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
sql/field.cc
View file @
a37e4311
...
@@ -8587,16 +8587,16 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type,
...
@@ -8587,16 +8587,16 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type,
else
if
(
tmp_length
>
PRECISION_FOR_FLOAT
)
else
if
(
tmp_length
>
PRECISION_FOR_FLOAT
)
{
{
sql_type
=
FIELD_TYPE_DOUBLE
;
sql_type
=
FIELD_TYPE_DOUBLE
;
length
=
DBL_DIG
+
7
;
/* -[digits].E+### */
length
=
MAX_DOUBLE_STR_LENGTH
;
}
}
else
else
length
=
FLT_DIG
+
6
;
/* -[digits].E+## */
length
=
MAX_FLOAT_STR_LENGTH
;
decimals
=
NOT_FIXED_DEC
;
decimals
=
NOT_FIXED_DEC
;
break
;
break
;
}
}
if
(
!
fld_length
&&
!
fld_decimals
)
if
(
!
fld_length
&&
!
fld_decimals
)
{
{
length
=
FLT_DIG
+
6
;
length
=
MAX_FLOAT_STR_LENGTH
;
decimals
=
NOT_FIXED_DEC
;
decimals
=
NOT_FIXED_DEC
;
}
}
if
(
length
<
decimals
&&
if
(
length
<
decimals
&&
...
...
sql/item.cc
View file @
a37e4311
...
@@ -6969,18 +6969,26 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
...
@@ -6969,18 +6969,26 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
{
{
if
(
decimals
!=
NOT_FIXED_DEC
)
if
(
decimals
!=
NOT_FIXED_DEC
)
{
{
int
delta1
=
max_length_orig
-
decimals_orig
;
/*
int
delta2
=
item
->
max_length
-
item
->
decimals
;
For FLOAT(M,D)/DOUBLE(M,D) do not change precision
max_length
=
max
(
delta1
,
delta2
)
+
decimals
;
if both fields have the same M and D
if
(
fld_type
==
MYSQL_TYPE_FLOAT
&&
max_length
>
FLT_DIG
+
2
)
*/
{
if
(
item
->
max_length
!=
max_length_orig
||
max_length
=
FLT_DIG
+
6
;
item
->
decimals
!=
decimals_orig
)
decimals
=
NOT_FIXED_DEC
;
}
if
(
fld_type
==
MYSQL_TYPE_DOUBLE
&&
max_length
>
DBL_DIG
+
2
)
{
{
max_length
=
DBL_DIG
+
7
;
int
delta1
=
max_length_orig
-
decimals_orig
;
decimals
=
NOT_FIXED_DEC
;
int
delta2
=
item
->
max_length
-
item
->
decimals
;
max_length
=
max
(
delta1
,
delta2
)
+
decimals
;
if
(
fld_type
==
MYSQL_TYPE_FLOAT
&&
max_length
>
FLT_DIG
+
2
)
{
max_length
=
MAX_FLOAT_STR_LENGTH
;
decimals
=
NOT_FIXED_DEC
;
}
else
if
(
fld_type
==
MYSQL_TYPE_DOUBLE
&&
max_length
>
DBL_DIG
+
2
)
{
max_length
=
MAX_DOUBLE_STR_LENGTH
;
decimals
=
NOT_FIXED_DEC
;
}
}
}
}
}
else
else
...
...
sql/mysql_priv.h
View file @
a37e4311
...
@@ -251,6 +251,11 @@ MY_LOCALE *my_locale_by_number(uint number);
...
@@ -251,6 +251,11 @@ MY_LOCALE *my_locale_by_number(uint number);
#define PRECISION_FOR_DOUBLE 53
#define PRECISION_FOR_DOUBLE 53
#define PRECISION_FOR_FLOAT 24
#define PRECISION_FOR_FLOAT 24
/* -[digits].E+## */
#define MAX_FLOAT_STR_LENGTH (FLT_DIG + 6)
/* -[digits].E+### */
#define MAX_DOUBLE_STR_LENGTH (DBL_DIG + 7)
/*
/*
Default time to wait before aborting a new client connection
Default time to wait before aborting a new client connection
that does not respond to "initial server greeting" timely
that does not respond to "initial server greeting" timely
...
...
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