diff options
| author | Kent Boortz <kent.boortz@sun.com> | 2010-12-29 00:47:05 +0100 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@sun.com> | 2010-12-29 00:47:05 +0100 |
| commit | 920d185fd8551b9737161ee903b2d0bc24dda2f8 (patch) | |
| tree | f61328771628e2b6b67f40d38e0a493c5ba4e6f7 /sql/mysqld.cc | |
| parent | b69b46c77561fd773943738c348c32b8bda5e51e (diff) | |
| parent | fddb1f1b1342026bbe39e5ae880c775fc5f189c1 (diff) | |
| download | mariadb-git-920d185fd8551b9737161ee903b2d0bc24dda2f8.tar.gz | |
Merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1a3a0886c1f..2e36bc6ca66 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1,4 +1,4 @@ -/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. +/* Copyright (c) 2000, 2010, 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 |