Skip to content

Commit d04063c

Browse files
vuvovamidenok
authored andcommitted
SQL: revert unnecessary change
Related to VIEW fix #4 (8e12edb)
1 parent b3fe45b commit d04063c

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

sql/item_timefunc.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,15 +1687,6 @@ void Item_func_curtime_utc::store_now_in_TIME(THD *thd, MYSQL_TIME *now_time)
16871687
*/
16881688
}
16891689

1690-
1691-
Item_func_now::Item_func_now(THD *thd, uint dec) :
1692-
Item_datetimefunc(thd, new (thd->mem_root) Item_decimal(thd, dec, TRUE)),
1693-
last_query_id(0)
1694-
{
1695-
decimals= dec;
1696-
}
1697-
1698-
16991690
bool Item_func_now::fix_fields(THD *thd, Item **items)
17001691
{
17011692
if (decimals > TIME_SECOND_PART_DIGITS)

sql/item_timefunc.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,8 @@ class Item_func_now :public Item_datetimefunc
746746
MYSQL_TIME ltime;
747747
query_id_t last_query_id;
748748
public:
749-
Item_func_now(THD *thd, uint dec);
749+
Item_func_now(THD *thd, uint dec): Item_datetimefunc(thd), last_query_id(0)
750+
{ decimals= dec; }
750751
bool fix_fields(THD *, Item **);
751752
void fix_length_and_dec() { fix_attributes_datetime(decimals); }
752753
bool get_date(MYSQL_TIME *res, ulonglong fuzzy_date);

0 commit comments

Comments
 (0)