summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-02-13 18:28:36 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2016-02-13 18:28:36 -0500
commitd23bd26bec787ebbdbd41be0204e9cb83baf4dbd (patch)
treedda05b0ebb3858e913b0ca3b864705e989bb7661 /sql/log.cc
parentb83de1151aab6dcc9f300159e31198364000de70 (diff)
parenta9a08b1e2f5b7a9e3ab7c7f75c768389b1d8238f (diff)
downloadmariadb-git-d23bd26bec787ebbdbd41be0204e9cb83baf4dbd.tar.gz
Merge tag 'mariadb-5.5.48' into 5.5-galera
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 cf0c066c750..9194838d424 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
- Copyright (c) 2009, 2014, SkySQL Ab.
+ Copyright (c) 2009, 2016, MariaDB
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