diff options
author | Igor Babaev <igor@askmonty.org> | 2012-04-11 20:44:52 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2012-04-11 20:44:52 -0700 |
commit | 9e74665a2d91e299d1b9c5c2695855426aad78eb (patch) | |
tree | 9c865c2e18fcb814ef80e96965debf53a0923e6a /sql/mysqld.h | |
parent | 1c0a89afcc1581187e8ee84abbd445da2bfa45d9 (diff) | |
parent | 85a025f30c5196c22c5b1d7960912fe9b3f0d6c0 (diff) | |
download | mariadb-git-9e74665a2d91e299d1b9c5c2695855426aad78eb.tar.gz |
Merge 5.5 -> 5.5-mwl248.
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 617ecbb8da2..6d2da80d7c8 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 |