summaryrefslogtreecommitdiff
path: root/sql/sql_time.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-16 16:24:36 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-16 16:24:36 +0200
commite5e95a287e2e449a63b3b8badfcc54f8fc84a072 (patch)
tree143e1d7abcd07c7afd2aaf0615f9a192409825c9 /sql/sql_time.cc
parent2b3f6ab417a116d213c24ed506b2ea468f24f413 (diff)
parentc7daabdb0579531a22c24697f9efbe2ea2759435 (diff)
downloadmariadb-git-e5e95a287e2e449a63b3b8badfcc54f8fc84a072.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_time.cc')
-rw-r--r--sql/sql_time.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc
index b128a7f7291..9584dfd5f63 100644
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates.
- Copyright (c) 2009, 2013 Monty Program Ab.
+ Copyright (c) 2009, 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by