summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-06-23 12:54:38 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-06-23 12:54:38 -0400
commitecdb2b6e86d4bef2718eaec61f1edd1c11e41e1a (patch)
tree010cc373543ab2e65c63b9e1e56a62252afa3c50 /sql/log.cc
parent51a32ebeb3653bfed481a3ddbfe5f93aecdf4a35 (diff)
parent12ae840375fe30da1c23647facaa0678858d6d92 (diff)
downloadmariadb-git-ecdb2b6e86d4bef2718eaec61f1edd1c11e41e1a.tar.gz
Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 9194838d424..02915fb1325 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
+/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
Copyright (c) 2009, 2016, MariaDB
This program is free software; you can redistribute it and/or modify