From: Marc Alff Date: July 8 2010 5:04pm Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3100) List-Archive: http://lists.mysql.com/commits/113154 Message-Id: <20100708170411.56F9B45E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5131530787126113485==" --===============5131530787126113485== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-cleanup/ based on revid:olav@stripped 3100 Marc Alff 2010-07-08 Fixed headers in include/mysql/psi modified: include/mysql/psi/mysql_file.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h include/mysql/psi/psi_abi_v2.h === modified file 'include/mysql/psi/mysql_file.h' --- a/include/mysql/psi/mysql_file.h 2010-03-31 14:05:33 +0000 +++ b/include/mysql/psi/mysql_file.h 2010-07-08 17:04:07 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ GNU General Public License for more details. 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef MYSQL_FILE_H #define MYSQL_FILE_H === modified file 'include/mysql/psi/mysql_thread.h' --- a/include/mysql/psi/mysql_thread.h 2010-03-09 18:03:02 +0000 +++ b/include/mysql/psi/mysql_thread.h 2010-07-08 17:04:07 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ GNU General Public License for more details. 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef MYSQL_THREAD_H #define MYSQL_THREAD_H === modified file 'include/mysql/psi/psi.h' --- a/include/mysql/psi/psi.h 2010-01-26 23:42:54 +0000 +++ b/include/mysql/psi/psi.h 2010-07-08 17:04:07 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2010 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ GNU General Public License for more details. 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #ifndef MYSQL_PERFORMANCE_SCHEMA_INTERFACE_H #define MYSQL_PERFORMANCE_SCHEMA_INTERFACE_H === modified file 'include/mysql/psi/psi_abi_v1.h' --- a/include/mysql/psi/psi_abi_v1.h 2009-12-01 00:49:15 +0000 +++ b/include/mysql/psi/psi_abi_v1.h 2010-07-08 17:04:07 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ GNU General Public License for more details. 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file mysql/psi/psi_abi_v1.h === modified file 'include/mysql/psi/psi_abi_v2.h' --- a/include/mysql/psi/psi_abi_v2.h 2009-12-01 00:49:15 +0000 +++ b/include/mysql/psi/psi_abi_v2.h 2010-07-08 17:04:07 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ GNU General Public License for more details. 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file mysql/psi/psi_abi_v1.h --===============5131530787126113485== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\ # cleanup/ # testament_sha1: 0e611604b922bc3e64e33d37a2189ee1fb5b223e # timestamp: 2010-07-08 11:04:11 -0600 # base_revision_id: olav@stripped # # Begin bundle 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 --===============5131530787126113485==--