summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-09-12 17:23:25 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-09-12 17:26:39 +0300
commit61bbf39915476ba7f9abe5cb6f2ddd4f704b9fbd (patch)
tree74425896945220d8d48bd63b315ee422d5ddd845
parentd28686ada6f72035f23b83960e63599f50fbc38d (diff)
downloadmariadb-git-61bbf39915476ba7f9abe5cb6f2ddd4f704b9fbd.tar.gz
Fix GCC -Woverloaded-virtual
Follow-up to 9d26f3dabb8299149af99faafa52398cce44e610: do not declare a never-overloaded function as virtual.
-rw-r--r--sql/field.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/field.h b/sql/field.h
index 07a7f455560..8b72ee6ff9a 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -3366,10 +3366,7 @@ class Field_time :public Field_temporal {
long curdays;
protected:
virtual void store_TIME(const MYSQL_TIME *ltime);
- virtual void store_TIME(const Time &t)
- {
- return store_TIME(t.get_mysql_time());
- }
+ void store_TIME(const Time &t) { return store_TIME(t.get_mysql_time()); }
int store_TIME_with_warning(const Time *ltime, const ErrConv *str, int warn);
bool check_zero_in_date_with_warn(date_mode_t fuzzydate);
static void do_field_time(Copy_field *copy);