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
681252c8
Commit
681252c8
authored
Dec 02, 2005
by
ramil@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b12956
parents
3d223afb
516fd425
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
24 deletions
+24
-24
mysql-test/r/ps.result
mysql-test/r/ps.result
+7
-7
mysql-test/t/count_distinct3.test
mysql-test/t/count_distinct3.test
+1
-1
sql/field.cc
sql/field.cc
+2
-2
sql/item.cc
sql/item.cc
+2
-2
sql/item.h
sql/item.h
+2
-2
sql/item_func.cc
sql/item_func.cc
+1
-1
sql/item_func.h
sql/item_func.h
+2
-2
sql/item_sum.cc
sql/item_sum.cc
+3
-3
sql/item_sum.h
sql/item_sum.h
+4
-4
No files found.
mysql-test/r/ps.result
View file @
681252c8
...
...
@@ -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)
- 65705152
19
- 65705152
20
- 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)
- 65705152
19
-
- 65705152
20
-
- 1282061302 -
- 6698761160 -
- 9647622201 -
set @var=2;
execute stmt using @var;
rand() cast(rand(10)*@precision as unsigned integer) cast(rand(?)*@precision as unsigned integer)
- 65705152
19
6555866465
- 1282061302 122346619
2
- 6698761160 644973187
3
- 65705152
20
6555866465
- 1282061302 122346619
3
- 6698761160 644973187
4
- 9647622201 8578261098
set @var=3;
execute stmt using @var;
rand() cast(rand(10)*@precision as unsigned integer) cast(rand(?)*@precision as unsigned integer)
- 65705152
19 9057697559
- 65705152
20 9057697560
- 1282061302 3730790581
- 6698761160 148086053
4
- 6698761160 148086053
5
- 9647622201 6211931236
drop table t1;
deallocate prepare stmt;
...
...
mysql-test/t/count_distinct3.test
View file @
681252c8
...
...
@@ -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
(
12
8
.0
*
@
rnd
AS
UNSIGNED
);
SET
@
grp
=
CAST
(
12
7
.0
*
@
rnd
AS
UNSIGNED
);
INSERT
INTO
t1
(
id
,
grp
,
id_rev
)
VALUES
(
@
id
,
@
grp
,
@
id_rev
);
dec
$
1
;
}
...
...
sql/field.cc
View file @
681252c8
...
...
@@ -3953,7 +3953,7 @@ longlong Field_float::val_int(void)
else
#endif
memcpy_fixed
((
byte
*
)
&
j
,
ptr
,
sizeof
(
j
));
return
(
(
longlong
)
j
);
return
(
longlong
)
rint
(
j
);
}
...
...
@@ -4241,7 +4241,7 @@ longlong Field_double::val_int(void)
else
#endif
doubleget
(
j
,
ptr
);
return
(
(
longlong
)
j
);
return
(
longlong
)
rint
(
j
);
}
...
...
sql/item.cc
View file @
681252c8
...
...
@@ -2459,7 +2459,7 @@ longlong Item_param::val_int()
{
switch
(
state
)
{
case
REAL_VALUE
:
return
(
longlong
)
(
value
.
real
+
(
value
.
real
>
0
?
0.5
:
-
0.5
)
);
return
(
longlong
)
rint
(
value
.
real
);
case
INT_VALUE
:
return
value
.
integer
;
case
DECIMAL_VALUE
:
...
...
@@ -5441,7 +5441,7 @@ void Item_cache_real::store(Item *item)
longlong
Item_cache_real
::
val_int
()
{
DBUG_ASSERT
(
fixed
==
1
);
return
(
longlong
)
(
value
+
(
value
>
0
?
0.5
:
-
0.5
)
);
return
(
longlong
)
rint
(
value
);
}
...
...
sql/item.h
View file @
681252c8
...
...
@@ -159,7 +159,7 @@ struct Hybrid_type_traits
{
val
->
real
/=
ulonglong2double
(
u
);
}
virtual
longlong
val_int
(
Hybrid_type
*
val
,
bool
unsigned_flag
)
const
{
return
(
longlong
)
val
->
real
;
}
{
return
(
longlong
)
rint
(
val
->
real
)
;
}
virtual
double
val_real
(
Hybrid_type
*
val
)
const
{
return
val
->
real
;
}
virtual
my_decimal
*
val_decimal
(
Hybrid_type
*
val
,
my_decimal
*
buf
)
const
;
virtual
String
*
val_str
(
Hybrid_type
*
val
,
String
*
buf
,
uint8
decimals
)
const
;
...
...
@@ -1354,7 +1354,7 @@ public:
{
return
LONGLONG_MAX
;
}
return
(
longlong
)
(
value
+
(
value
>
0
?
0.5
:
-
0.5
)
);
return
(
longlong
)
rint
(
value
);
}
String
*
val_str
(
String
*
);
my_decimal
*
val_decimal
(
my_decimal
*
);
...
...
sql/item_func.cc
View file @
681252c8
...
...
@@ -735,7 +735,7 @@ longlong Item_func_numhybrid::val_int()
case
INT_RESULT
:
return
int_op
();
case
REAL_RESULT
:
return
(
longlong
)
real_op
(
);
return
(
longlong
)
rint
(
real_op
()
);
case
STRING_RESULT
:
{
int
err_not_used
;
...
...
sql/item_func.h
View file @
681252c8
...
...
@@ -199,7 +199,7 @@ public:
String
*
val_str
(
String
*
str
);
my_decimal
*
val_decimal
(
my_decimal
*
decimal_value
);
longlong
val_int
()
{
DBUG_ASSERT
(
fixed
==
1
);
return
(
longlong
)
val_real
(
);
}
{
DBUG_ASSERT
(
fixed
==
1
);
return
(
longlong
)
rint
(
val_real
()
);
}
enum
Item_result
result_type
()
const
{
return
REAL_RESULT
;
}
void
fix_length_and_dec
()
{
decimals
=
NOT_FIXED_DEC
;
max_length
=
float_length
(
decimals
);
}
...
...
@@ -943,7 +943,7 @@ class Item_func_udf_float :public Item_udf_func
longlong
val_int
()
{
DBUG_ASSERT
(
fixed
==
1
);
return
(
longlong
)
Item_func_udf_float
::
val_real
(
);
return
(
longlong
)
rint
(
Item_func_udf_float
::
val_real
()
);
}
my_decimal
*
val_decimal
(
my_decimal
*
dec_buf
)
{
...
...
sql/item_sum.cc
View file @
681252c8
...
...
@@ -452,7 +452,7 @@ longlong Item_sum_sum::val_int()
&
result
);
return
result
;
}
return
(
longlong
)
val_real
(
);
return
(
longlong
)
rint
(
val_real
()
);
}
...
...
@@ -1285,7 +1285,7 @@ longlong Item_sum_hybrid::val_int()
return
sum_int
;
}
default:
return
(
longlong
)
Item_sum_hybrid
::
val_real
(
);
return
(
longlong
)
rint
(
Item_sum_hybrid
::
val_real
()
);
}
}
...
...
@@ -2001,7 +2001,7 @@ double Item_avg_field::val_real()
longlong
Item_avg_field
::
val_int
()
{
return
(
longlong
)
val_real
(
);
return
(
longlong
)
rint
(
val_real
()
);
}
...
...
sql/item_sum.h
View file @
681252c8
...
...
@@ -126,7 +126,7 @@ public:
longlong
val_int
()
{
DBUG_ASSERT
(
fixed
==
1
);
return
(
longlong
)
val_real
(
);
/* Real as default */
return
(
longlong
)
rint
(
val_real
()
);
/* Real as default */
}
String
*
val_str
(
String
*
str
);
my_decimal
*
val_decimal
(
my_decimal
*
);
...
...
@@ -392,7 +392,7 @@ public:
bool
add
();
double
val_real
();
// In SPs we might force the "wrong" type with select into a declare variable
longlong
val_int
()
{
return
(
longlong
)
val_real
(
);
}
longlong
val_int
()
{
return
(
longlong
)
rint
(
val_real
()
);
}
my_decimal
*
val_decimal
(
my_decimal
*
);
String
*
val_str
(
String
*
str
);
void
reset_field
();
...
...
@@ -421,7 +421,7 @@ public:
enum
Type
type
()
const
{
return
FIELD_VARIANCE_ITEM
;
}
double
val_real
();
longlong
val_int
()
{
/* can't be fix_fields()ed */
return
(
longlong
)
val_real
(
);
}
{
/* can't be fix_fields()ed */
return
(
longlong
)
rint
(
val_real
()
);
}
String
*
val_str
(
String
*
);
my_decimal
*
val_decimal
(
my_decimal
*
);
bool
is_null
()
{
(
void
)
val_int
();
return
null_value
;
}
...
...
@@ -699,7 +699,7 @@ class Item_sum_udf_float :public Item_udf_sum
longlong
val_int
()
{
DBUG_ASSERT
(
fixed
==
1
);
return
(
longlong
)
Item_sum_udf_float
::
val_real
(
);
return
(
longlong
)
rint
(
Item_sum_udf_float
::
val_real
()
);
}
double
val_real
();
String
*
val_str
(
String
*
str
);
...
...
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