database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-16884 Remove tests for field_type() in Item_cache_temporal

Browse Source
This commit is contained in:
Alexander Barkov
2018-08-02 17:49:28 +04:00
parent c7115428ed
commit 8ecc75373f
4 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_type.h
View File

@ -164,6 +164,7 @@ protected:
double d= (double) num + frac / (double) TIME_SECOND_PART_FACTOR;
return negate ? -d : d;
}
longlong to_packed() const { return ::pack_time(this); }
public:
};
@ -373,8 +374,8 @@ public:
{
DBUG_ASSERT(is_valid_time_slow());
DBUG_ASSERT(other->is_valid_time_slow());
longlong p0= pack_time(this);
longlong p1= pack_time(other);
longlong p0= to_packed();
longlong p1= other->to_packed();
if (p0 < p1)
return -1;
if (p0 > p1)
@ -415,6 +416,10 @@ public:
{
return is_valid_time() ? Temporal::to_decimal(to) : bad_to_decimal(to);
}
longlong to_packed() const
{
return is_valid_time() ? Temporal::to_packed() : 0;
}
};
@ -459,6 +464,8 @@ public:
{
return ::check_date_with_warn(this, flags, MYSQL_TIMESTAMP_ERROR);
}
static sql_mode_t comparison_flags_for_get_date()
{ return TIME_INVALID_DATES | TIME_FUZZY_DATES; }
};
@ -666,6 +673,10 @@ public:
{
return is_valid_datetime() ? Temporal::to_decimal(to) : bad_to_decimal(to);
}
longlong to_packed() const
{
return is_valid_datetime() ? Temporal::to_packed() : 0;
}
};
/*