diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
| commit | 932646b1ff6a8f5815a961340a9e1ee4702f5b44 (patch) | |
| tree | 5bc42ace8ae1f7e4d00baffd468bdb7564e851f1 /sql/log.h | |
| parent | 0bb30f3603b519780eaf3fe0527b1c6af285229a (diff) | |
| parent | 33492ec8d4e2077cf8e07d0628a959d8729bd1f9 (diff) | |
| download | mariadb-git-932646b1ff6a8f5815a961340a9e1ee4702f5b44.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.h b/sql/log.h index 40e9e4fdc58..a74a01f9c67 100644 --- a/sql/log.h +++ b/sql/log.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. - Copyright (c) 2009, 2012, Monty Program Ab +/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. + Copyright (c) 2009, 2016, Monty Program 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 |