diff options
| author | Alexander Barkov <alexander.barkov@oracle.com> | 2012-07-24 09:29:16 +0400 |
|---|---|---|
| committer | Alexander Barkov <alexander.barkov@oracle.com> | 2012-07-24 09:29:16 +0400 |
| commit | 9e75b589758f96289fe1b295e93b0b659349affb (patch) | |
| tree | 2a34d1515e82519b8e50aee05490e838146b3ff8 | |
| parent | d15e2f721433e062506e3546d59469acefeba73e (diff) | |
| parent | 1cb513ba6b199c5bd4a2ae159839adb5dd7561a4 (diff) | |
| download | mariadb-git-9e75b589758f96289fe1b295e93b0b659349affb.tar.gz | |
Merging from 5.1
| -rw-r--r-- | sql/share/charsets/Index.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index 80b844e2f19..07e7e37b798 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -3,7 +3,7 @@ <charsets max-id="99"> <copyright> - Copyright (C) 2003 MySQL AB + Copyright (c) 2003, 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 |