summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2005-06-20 14:56:17 +0300
committerunknown <bell@sanja.is.com.ua>2005-06-20 14:56:17 +0300
commit58adb70a8bd43550a7e5d9e1b0226a7966742f63 (patch)
tree96f81cd1c939ca0d139720f8df06fb4db9ef289d /sql/item_timefunc.h
parent2ccb51061b31d1537bd3f7d32ea0ed2132fdc7f4 (diff)
downloadmariadb-git-58adb70a8bd43550a7e5d9e1b0226a7966742f63.tar.gz
fixed time_format printing (BUG#7521)
mysql-test/r/view.result: using time_format in view (BUG#7521) mysql-test/t/view.test: using time_format in view (BUG#7521) sql/item_timefunc.h: fixed func_name reportion
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 5c172b4698b..a6dd9f7da91 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -503,7 +503,8 @@ public:
Item_func_date_format(Item *a,Item *b,bool is_time_format_arg)
:Item_str_func(a,b),is_time_format(is_time_format_arg) {}
String *val_str(String *str);
- const char *func_name() const { return "date_format"; }
+ const char *func_name() const
+ { return is_time_format ? "time_format" : "date_format"; }
void fix_length_and_dec();
uint format_length(const String *format);
};