diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-23 12:54:38 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-23 12:54:38 -0400 |
commit | ecdb2b6e86d4bef2718eaec61f1edd1c11e41e1a (patch) | |
tree | 010cc373543ab2e65c63b9e1e56a62252afa3c50 /sql/log.cc | |
parent | 51a32ebeb3653bfed481a3ddbfe5f93aecdf4a35 (diff) | |
parent | 12ae840375fe30da1c23647facaa0678858d6d92 (diff) | |
download | mariadb-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.cc | 2 |
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 |