database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/r/type_datetime.result:
  SCCS merged
sql/item_timefunc.h:
  SCCS merged
This commit is contained in:
unknown
2007-03-22 12:26:32 +04:00
parent 1fdab610a2 50b5064ccd
commit 23354862f0
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/type_datetime.result
View File

@ -168,6 +168,9 @@ dt
0000-00-00 00:00:00
0000-00-00 00:00:00
drop table t1;
select cast('2006-12-05 22:10:10' as datetime) + 0;
cast('2006-12-05 22:10:10' as datetime) + 0
20061205221010.000000
CREATE TABLE t1(a DATETIME NOT NULL);
INSERT INTO t1 VALUES ('20060606155555');
SELECT a FROM t1 WHERE a=(SELECT MAX(a) FROM t1) AND (a="20060606155555");

6
mysql-test/t/type_datetime.test
View File

@ -113,6 +113,12 @@ insert into t1 values ("00-00-00"), ("00-00-00 00:00:00");
select * from t1;
drop table t1;
#
# Bug #16546 DATETIME+0 not always coerced the same way
#
select cast('2006-12-05 22:10:10' as datetime) + 0;
# End of 4.1 tests
#

7
sql/item_timefunc.h
View File

@ -847,12 +847,19 @@ public:
String *val_str(String *str);
const char *cast_type() const { return "datetime"; }
enum_field_types field_type() const { return MYSQL_TYPE_DATETIME; }
void fix_length_and_dec()
{
Item_typecast_maybe_null::fix_length_and_dec();
decimals= DATETIME_DEC;
}
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_datetime(maybe_null, name, t_arg, &my_charset_bin));
}
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);