From: kevin.lewis Date: April 27 2011 9:49pm Subject: bzr commit into mysql-trunk-innodb branch (kevin.lewis:3608) List-Archive: http://lists.mysql.com/commits/136252 Message-Id: <20110427214933.390CEECA905@kevin-lewis-macbook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0529158102==" --===============0529158102== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/kevinlewis/Work/Mysql/Whitespace/mysql-trunk-innodb/ based on revid:kevin.lewis@stripped 3608 kevin.lewis@stripped 2011-04-27 Copyright Notice changes for the files associated with rb::645 Use current FSF address and approved copyright language. Also some whitespace cleanup. Asked by Marko in rb::645 to put this into a separate patch. modified: storage/innobase/btr/btr0cur.c storage/innobase/dict/dict0boot.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0mem.c storage/innobase/fil/fil0fil.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.h storage/innobase/include/fsp0fsp.h storage/innobase/include/fsp0fsp.ic storage/innobase/include/ha_prototypes.h storage/innobase/include/page0types.h storage/innobase/include/page0zip.ic storage/innobase/include/trx0purge.h storage/innobase/include/trx0sys.ic storage/innobase/include/univ.i storage/innobase/include/ut0bh.ic storage/innobase/mtr/mtr0log.c storage/innobase/page/page0zip.c storage/innobase/row/row0mysql.c storage/innobase/row/row0row.c storage/innobase/srv/srv0srv.c storage/innobase/sync/sync0rw.c storage/innobase/ut/ut0bh.c storage/innobase/ut/ut0ut.c === modified file 'storage/innobase/btr/btr0cur.c' --- a/storage/innobase/btr/btr0cur.c revid:kevin.lewis@stripped +++ b/storage/innobase/btr/btr0cur.c revid:kevin.lewis@stripped @@ -18,8 +18,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/dict/dict0boot.c' --- a/storage/innobase/dict/dict0boot.c revid:kevin.lewis@stripped +++ b/storage/innobase/dict/dict0boot.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/dict/dict0crea.c' --- a/storage/innobase/dict/dict0crea.c revid:kevin.lewis@stripped +++ b/storage/innobase/dict/dict0crea.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/dict/dict0load.c' --- a/storage/innobase/dict/dict0load.c revid:kevin.lewis@stripped +++ b/storage/innobase/dict/dict0load.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/dict/dict0mem.c' --- a/storage/innobase/dict/dict0mem.c revid:kevin.lewis@stripped +++ b/storage/innobase/dict/dict0mem.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/fil/fil0fil.c' --- a/storage/innobase/fil/fil0fil.c revid:kevin.lewis@stripped +++ b/storage/innobase/fil/fil0fil.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/fsp/fsp0fsp.c' --- a/storage/innobase/fsp/fsp0fsp.c revid:kevin.lewis@stripped +++ b/storage/innobase/fsp/fsp0fsp.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/handler/ha_innodb.cc' --- a/storage/innobase/handler/ha_innodb.cc revid:kevin.lewis@stripped +++ b/storage/innobase/handler/ha_innodb.cc revid:kevin.lewis@stripped @@ -27,7 +27,9 @@ FOR A PARTICULAR PURPOSE. See the GNU Ge 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., -51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA + +*****************************************************************************/ #include // explain_filename, nz2, EXPLAIN_PARTITIONS_AS_COMMENT, // EXPLAIN_FILENAME_MAX_EXTRA_LENGTH @@ -1372,7 +1374,7 @@ innobase_get_stmt( } /**********************************************************************//** -Get the current seting of the table_def_size global parameter. We do +Get the current setting of the table_def_size global parameter. We do a dirty read because for one there is no synchronization object and secondly there is little harm in doing so even if we get a torn read. @return value of table_def_size */ === modified file 'storage/innobase/handler/handler0alter.cc' --- a/storage/innobase/handler/handler0alter.cc revid:kevin.lewis@stripped +++ b/storage/innobase/handler/handler0alter.cc revid:kevin.lewis@stripped @@ -649,7 +649,7 @@ innobase_add_index_cleanup( /* Note: This check excludes the system tables. However, we should be safe because users cannot add indexes to system - tables. */ + tables. */ if (UT_LIST_GET_LEN(table->foreign_list) == 0 && UT_LIST_GET_LEN(table->referenced_list) == 0 === modified file 'storage/innobase/handler/i_s.cc' --- a/storage/innobase/handler/i_s.cc revid:kevin.lewis@stripped +++ b/storage/innobase/handler/i_s.cc revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/ibuf/ibuf0ibuf.c' --- a/storage/innobase/ibuf/ibuf0ibuf.c revid:kevin.lewis@stripped +++ b/storage/innobase/ibuf/ibuf0ibuf.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/dict0dict.h' --- a/storage/innobase/include/dict0dict.h revid:kevin.lewis@stripped +++ b/storage/innobase/include/dict0dict.h revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/dict0dict.ic' --- a/storage/innobase/include/dict0dict.ic revid:kevin.lewis@stripped +++ b/storage/innobase/include/dict0dict.ic revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/dict0mem.h' --- a/storage/innobase/include/dict0mem.h revid:kevin.lewis@stripped +++ b/storage/innobase/include/dict0mem.h revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/fsp0fsp.h' --- a/storage/innobase/include/fsp0fsp.h revid:kevin.lewis@stripped +++ b/storage/innobase/include/fsp0fsp.h revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/fsp0fsp.ic' --- a/storage/innobase/include/fsp0fsp.ic revid:kevin.lewis@stripped +++ b/storage/innobase/include/fsp0fsp.ic revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/ha_prototypes.h' --- a/storage/innobase/include/ha_prototypes.h revid:kevin.lewis@stripped +++ b/storage/innobase/include/ha_prototypes.h revid:kevin.lewis@stripped @@ -306,7 +306,7 @@ thd_set_lock_wait_time( ulint value); /*!< in: time waited for the lock */ /**********************************************************************//** -Get the current seting of the table_cache_size global parameter. We do +Get the current setting of the table_cache_size global parameter. We do a dirty read because for one there is no synchronization object and secondly there is little harm in doing so even if we get a torn read. @return SQL statement string */ === modified file 'storage/innobase/include/page0types.h' --- a/storage/innobase/include/page0types.h revid:kevin.lewis@stripped +++ b/storage/innobase/include/page0types.h revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/page0zip.ic' --- a/storage/innobase/include/page0zip.ic revid:kevin.lewis@stripped +++ b/storage/innobase/include/page0zip.ic revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/trx0purge.h' --- a/storage/innobase/include/trx0purge.h revid:kevin.lewis@stripped +++ b/storage/innobase/include/trx0purge.h revid:kevin.lewis@stripped @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2011, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, 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 the Free Software @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/include/trx0sys.ic' --- a/storage/innobase/include/trx0sys.ic revid:kevin.lewis@stripped +++ b/storage/innobase/include/trx0sys.ic revid:kevin.lewis@stripped @@ -387,7 +387,7 @@ trx_is_active_low( } else if (UNIV_UNLIKELY(trx_id >= trx_sys->max_trx_id)) { /* There must be corruption: we let the caller handle the - diagnostic prints in this case. */ + diagnostic prints in this case. */ trx = NULL; if (corrupt != NULL) { === modified file 'storage/innobase/include/univ.i' --- a/storage/innobase/include/univ.i revid:kevin.lewis@stripped +++ b/storage/innobase/include/univ.i revid:kevin.lewis@stripped @@ -25,8 +25,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -311,7 +311,7 @@ definitions: */ /* The following alignment is used in memory allocations in memory heap management to ensure correct alignment for doubles etc. */ -#define UNIV_MEM_ALIGNMENT 8 +#define UNIV_MEM_ALIGNMENT 8 /* The following alignment is used in aligning lints etc. */ #define UNIV_WORD_ALIGNMENT UNIV_WORD_SIZE === modified file 'storage/innobase/include/ut0bh.ic' --- a/storage/innobase/include/ut0bh.ic revid:kevin.lewis@stripped +++ b/storage/innobase/include/ut0bh.ic revid:kevin.lewis@stripped @@ -1,5 +1,6 @@ /***************************************************************************//** -Copyright (c) 2011, Oracle Corpn. All Rights Reserved. + +Copyright (c) 2011, 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 the Free Software @@ -10,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/mtr/mtr0log.c' --- a/storage/innobase/mtr/mtr0log.c revid:kevin.lewis@stripped +++ b/storage/innobase/mtr/mtr0log.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/page/page0zip.c' --- a/storage/innobase/page/page0zip.c revid:kevin.lewis@stripped +++ b/storage/innobase/page/page0zip.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/row/row0mysql.c' --- a/storage/innobase/row/row0mysql.c revid:kevin.lewis@stripped +++ b/storage/innobase/row/row0mysql.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/row/row0row.c' --- a/storage/innobase/row/row0row.c revid:kevin.lewis@stripped +++ b/storage/innobase/row/row0row.c revid:kevin.lewis@stripped @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/srv/srv0srv.c' --- a/storage/innobase/srv/srv0srv.c revid:kevin.lewis@stripped +++ b/storage/innobase/srv/srv0srv.c revid:kevin.lewis@stripped @@ -26,8 +26,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/sync/sync0rw.c' --- a/storage/innobase/sync/sync0rw.c revid:kevin.lewis@stripped +++ b/storage/innobase/sync/sync0rw.c revid:kevin.lewis@stripped @@ -583,14 +583,14 @@ rw_lock_x_lock_low( #ifdef UNIV_SYNC_DEBUG pass, #endif - file_name, line); + file_name, line); } else { /* Decrement failed: relock or failed lock */ if (!pass && lock->recursive && os_thread_eq(lock->writer_thread, curr_thread)) { /* Relock */ - lock->lock_word -= X_LOCK_DECR; + lock->lock_word -= X_LOCK_DECR; } else { /* Another thread locked before us */ return(FALSE); === modified file 'storage/innobase/ut/ut0bh.c' --- a/storage/innobase/ut/ut0bh.c revid:kevin.lewis@stripped +++ b/storage/innobase/ut/ut0bh.c revid:kevin.lewis@stripped @@ -1,11 +1,6 @@ /***************************************************************************//** -Copyright (c) 2010, 2011, Oracle Corpn. All Rights Reserved. -Portions of this file contain modifications contributed and copyrighted by -Sun Microsystems, Inc. Those modifications are gratefully acknowledged and -are described briefly in the InnoDB documentation. The contributions by -Sun Microsystems are incorporated with their permission, and subject to the -conditions contained in the file COPYING.Sun_Microsystems. +Copyright (c) 2010, 2011, 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 the Free Software @@ -16,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ === modified file 'storage/innobase/ut/ut0ut.c' --- a/storage/innobase/ut/ut0ut.c revid:kevin.lewis@stripped +++ b/storage/innobase/ut/ut0ut.c revid:kevin.lewis@stripped @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2011, Oracle Corpn. All Rights Reserved. +Copyright (c) 1994, 2011, 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 the Free Software @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied w FOR A PARTICULAR PURPOSE. See the 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 +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ --===============0529158102== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/kevin.lewis@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kevin.lewis@stripped # target_branch: file:///Users/kevinlewis/Work/Mysql/Whitespace/mysql-\ # trunk-innodb/ # testament_sha1: a8ad53017f40903d3b73090b849fc8e1558d1671 # timestamp: 2011-04-27 16:49:32 -0500 # base_revision_id: kevin.lewis@stripped\ # f6b0fwj9sdp9fotn # # Begin bundle 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 yylsgA== --===============0529158102==--