diff options
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 40397351c18..5b968ed80eb 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -330,9 +330,10 @@ public: { init_make_field(tmp_field,FIELD_TYPE_DATE); } + Field *tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { - return (!t_arg) ? result_field : new Field_date(maybe_null, name, t_arg, thd_charset()); + return (new Field_date(maybe_null, name, t_arg, thd_charset())); } }; @@ -347,10 +348,10 @@ public: { init_make_field(tmp_field,FIELD_TYPE_DATETIME); } + Field *tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { - return (!t_arg) ? result_field : new Field_datetime(maybe_null, name, - t_arg, thd_charset()); + return (new Field_datetime(maybe_null, name, t_arg, thd_charset())); } }; @@ -373,10 +374,10 @@ public: { init_make_field(tmp_field,FIELD_TYPE_TIME); } + Field *tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { - return (!t_arg) ? result_field : - new Field_time(maybe_null, name, t_arg, thd_charset()); + return (new Field_time(maybe_null, name, t_arg, thd_charset())); } }; @@ -475,10 +476,10 @@ public: { init_make_field(tmp_field,FIELD_TYPE_TIME); } + Field *tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { - return (!t_arg) ? result_field : - new Field_time(maybe_null, name, t_arg, thd_charset()); + return (new Field_time(maybe_null, name, t_arg, thd_charset())); } }; @@ -570,10 +571,10 @@ public: { init_make_field(tmp_field,FIELD_TYPE_DATE); } + Field *tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { - return (!t_arg) ? result_field : - new Field_date(maybe_null, name, t_arg, thd_charset()); + return (new Field_date(maybe_null, name, t_arg, thd_charset())); } }; @@ -587,10 +588,10 @@ public: { init_make_field(tmp_field,FIELD_TYPE_TIME); } + Field *tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { - return (!t_arg) ? result_field : - new Field_time(maybe_null, name, t_arg, thd_charset()); + return (new Field_time(maybe_null, name, t_arg, thd_charset())); } }; @@ -604,9 +605,9 @@ public: { init_make_field(tmp_field,FIELD_TYPE_DATETIME); } + Field *tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { - return (!t_arg) ? result_field : new Field_datetime(maybe_null, name, - t_arg, thd_charset()); + return (new Field_datetime(maybe_null, name, t_arg, thd_charset())); } }; |