diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-26 13:59:35 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-26 13:59:35 +0300 |
| commit | e0015163515d1fe5d3747c6f859461a30c2ecfd6 (patch) | |
| tree | e8602e5ae53ae2cef06322a338205b501efe8d2a /sql/mysqld.h | |
| parent | f96fd3f40f37c0080e71e45f85e53bd156aa27f5 (diff) | |
| parent | b6ad03cde9367e4fae45f8d84d8175599fab61e9 (diff) | |
| download | mariadb-git-e0015163515d1fe5d3747c6f859461a30c2ecfd6.tar.gz | |
Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 99093e1e83b..9ce53555e45 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. 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 |