diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
| commit | d38e7d6676a144f1f41fb15c0f7e9860593e7ccb (patch) | |
| tree | e55f53ff3cc4b044769ca269561a933e3c93f05f /sql/sql_profile.cc | |
| parent | 3a0d42c6c692f303b372d4effd237ec93779aeaa (diff) | |
| parent | 1fa37ae427bc351530f7fcfd6050d1b1cdd0167b (diff) | |
| download | mariadb-git-d38e7d6676a144f1f41fb15c0f7e9860593e7ccb.tar.gz | |
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index 7bfb127815d..116cdb91ef3 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -1,4 +1,6 @@ -/* Copyright (c) 2007, 2010 Oracle and/or its affiliates. +/* + Copyright (c) 2007, 2010, Oracle and/or its affiliates. + Copyright (c) 2008-2011 Monty Program Ab 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 @@ -11,7 +13,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ /** |