summaryrefslogtreecommitdiff
path: root/sql/spatial.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-12-11 19:28:05 +0200
committerMichael Widenius <monty@askmonty.org>2011-12-11 19:28:05 +0200
commit24e452a208adebedce6a8a418265fced66bfb027 (patch)
tree83bc0c6e237fbd9f9dcbd2ac79f03a3b86756239 /sql/spatial.h
parent8a09adb3eaf036b652b11afea7d9d86a978fa566 (diff)
parent148587461954b544355bc808a89bfed1a70694e1 (diff)
downloadmariadb-git-24e452a208adebedce6a8a418265fced66bfb027.tar.gz
Merge with 5.1 & fixes to IGNORE handling
Diffstat (limited to 'sql/spatial.h')
-rw-r--r--sql/spatial.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/spatial.h b/sql/spatial.h
index 3ca5ed9ae20..cd29b14ff38 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/*
+ Copyright (c) 2002, 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
@@ -10,8 +11,9 @@
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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#ifndef _spatial_h
#define _spatial_h