mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into hundin.mysql.fi:/home/marko/mysql-5.0
This commit is contained in:
unknown 2005-03-07 21:30:43 +02:00
commit c324036c5f
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/cast.result
View file

@ -203,3 +203,9 @@ cast(@v1 as decimal(22, 2))
select cast(-1e18 as decimal(22,2)); select cast(-1e18 as decimal(22,2));
cast(-1e18 as decimal(22,2)) cast(-1e18 as decimal(22,2))
-1000000000000000000.00 -1000000000000000000.00
create table t1(s1 time);
insert into t1 values ('11:11:11');
select cast(s1 as decimal(7,2)) from t1;
cast(s1 as decimal(7,2))
111111.00
drop table t1;

1
mysql-test/r/func_group.result
View file

@ -855,7 +855,6 @@ select col1,sum(col1),max(col1),min(col1) from t1 group by col1;
col1 sum(col1) max(col1) min(col1) col1 sum(col1) max(col1) min(col1)
5.000000000010 10.000000000020 5.000000000010 5.000000000010 5.000000000010 10.000000000020 5.000000000010 5.000000000010
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1( CREATE TABLE t1(
id int PRIMARY KEY, id int PRIMARY KEY,
a int, a int,

5
mysql-test/t/cast.test
View file

@ -126,3 +126,8 @@ select cast(cast('1.2' as decimal(3,2)) as signed);
set @v1=1e18; set @v1=1e18;
select cast(@v1 as decimal(22, 2)); select cast(@v1 as decimal(22, 2));
select cast(-1e18 as decimal(22,2)); select cast(-1e18 as decimal(22,2));
create table t1(s1 time);
insert into t1 values ('11:11:11');
select cast(s1 as decimal(7,2)) from t1;
drop table t1;

1
sql/field.cc
View file

@ -626,7 +626,6 @@ int Field_str::store_decimal(const my_decimal *d)
my_decimal *Field_str::val_decimal(my_decimal *decimal_value) my_decimal *Field_str::val_decimal(my_decimal *decimal_value)
{ {
DBUG_ASSERT(result_type() == INT_RESULT);
longlong nr= val_int(); longlong nr= val_int();
int2my_decimal(E_DEC_FATAL_ERROR, nr, 0, decimal_value); int2my_decimal(E_DEC_FATAL_ERROR, nr, 0, decimal_value);
return decimal_value; return decimal_value;