mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-27 18:55:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt

Browse source 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/item_timefunc.h:
  merging
This commit is contained in:
unknown 2007-03-22 12:28:21 +04:00
commit 475384c9d5
3 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/item_timefunc.h
View file

@ -856,8 +856,14 @@ public:
{
return tmp_table_field_from_field_type(table, 0);
}
void fix_length_and_dec()
{
Item_typecast_maybe_null::fix_length_and_dec();
decimals= DATETIME_DEC;
}
bool result_as_longlong() { return TRUE; }
longlong val_int();
double val() { return (double) val_int(); }
my_decimal *val_decimal(my_decimal *decimal_value)
{
DBUG_ASSERT(fixed == 1);