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 /include/my_bitmap.h | |
| 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 'include/my_bitmap.h')
| -rw-r--r-- | include/my_bitmap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/my_bitmap.h b/include/my_bitmap.h index 09a2ff3fe65..a98dd58bd72 100644 --- a/include/my_bitmap.h +++ b/include/my_bitmap.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. +/* Copyright (c) 2001, 2011, Oracle and/or its affiliates. Copyright (c) 2009-2011, Monty Program Ab This program is free software; you can redistribute it and/or modify @@ -12,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 +*/ #ifndef _my_bitmap_h_ #define _my_bitmap_h_ |