diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-17 11:52:41 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-17 11:52:41 +0200 |
| commit | 387721101c3a6e741506ae2a349c046de60426fc (patch) | |
| tree | 04afcc4a59592f5fa900547ba50287c0913b0d40 /include | |
| parent | d18a6702aa49c694473eddd77780e334d21c06ca (diff) | |
| parent | e63d0c916bf36c1164143d05cc57a50b47827e2b (diff) | |
| download | mariadb-git-387721101c3a6e741506ae2a349c046de60426fc.tar.gz | |
merge mysql-5.1->mysql-5.1-security
Diffstat (limited to 'include')
| -rw-r--r-- | include/decimal.h | 2 | ||||
| -rw-r--r-- | include/m_ctype.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/decimal.h b/include/decimal.h index c377bd4a400..09ff879fa03 100644 --- a/include/decimal.h +++ b/include/decimal.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2011, 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 diff --git a/include/m_ctype.h b/include/m_ctype.h index f8d654f387e..d58081ec19e 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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 |