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 | a8d03ab23519d4afc288a6490676ddb8745e3e72 (patch) | |
| tree | e55f53ff3cc4b044769ca269561a933e3c93f05f /storage/federated | |
| parent | 04f3ecf632816a940e2838949e0216d638436fd8 (diff) | |
| parent | 13fefeb04ade34418cd9d99aa93bffb69fdae27e (diff) | |
| download | mariadb-git-a8d03ab23519d4afc288a6490676ddb8745e3e72.tar.gz | |
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'storage/federated')
| -rwxr-xr-x | storage/federated/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | storage/federated/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/federated/ha_federated.cc | 4 | ||||
| -rw-r--r-- | storage/federated/ha_federated.h | 6 |
4 files changed, 9 insertions, 6 deletions
diff --git a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt index 3f3201d351c..67dc978b9d5 100755 --- a/storage/federated/CMakeLists.txt +++ b/storage/federated/CMakeLists.txt @@ -1,4 +1,5 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (c) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc. +# Use is subject to license terms. # # 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/storage/federated/Makefile.am b/storage/federated/Makefile.am index 0ae819800f3..7db392ed2a2 100644 --- a/storage/federated/Makefile.am +++ b/storage/federated/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (c) 2006, 2010, Oracle and/or its affiliates # # 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/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index d4cffbed59e..27e4d787766 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2010 Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 2010, Oracle and/or its affiliates 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 +11,7 @@ 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 */ /* diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h index 142e0e95e2b..7f0d72fa40a 100644 --- a/storage/federated/ha_federated.h +++ b/storage/federated/ha_federated.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2003 MySQL AB +/* + Copyright (c) 2004, 2010, Oracle and/or its affiliates 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 +12,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 +*/ /* Please read ha_exmple.cc before reading this file. |