diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-25 17:49:41 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-25 17:49:41 -0500 |
| commit | ae6e1548cbda6cb1509f84edb57786c9520a7a6e (patch) | |
| tree | 1e077c56860cfa1149e85117a2a2311d901c0d1c /sql/log.cc | |
| parent | e36fe045c03038b3bc2d9d21b4bbce66077985f5 (diff) | |
| parent | ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (diff) | |
| download | mariadb-git-ae6e1548cbda6cb1509f84edb57786c9520a7a6e.tar.gz | |
Merge from maria/5.5 (-rtag:mariadb-5.5.36).
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 7f6cff3cc59..a09651ffe0f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2009, 2013, Monty Program Ab +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2009, 2014, SkySQL Ab. 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 |