diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-01 17:27:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-01 17:27:34 +0300 |
| commit | 1d0f70c2f894b27e98773a282871d32802f67964 (patch) | |
| tree | 833e683e0ced29c4323c29a9d845703d4dfcd81b /storage/innobase/include/row0undo.h | |
| parent | 5a86a61219826aadf8d08cbc447fe438f2bf50c3 (diff) | |
| download | mariadb-git-1d0f70c2f894b27e98773a282871d32802f67964.tar.gz | |
Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6
Diffstat (limited to 'storage/innobase/include/row0undo.h')
| -rw-r--r-- | storage/innobase/include/row0undo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h index 6eb4ca448b3..90a15172ae0 100644 --- a/storage/innobase/include/row0undo.h +++ b/storage/innobase/include/row0undo.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1997, 2009, 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 warranty of MERCHANTABILITY or FITNESS 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 *****************************************************************************/ |