diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-11 19:28:05 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-11 19:28:05 +0200 |
| commit | 24e452a208adebedce6a8a418265fced66bfb027 (patch) | |
| tree | 83bc0c6e237fbd9f9dcbd2ac79f03a3b86756239 /sql/item_geofunc.cc | |
| parent | 8a09adb3eaf036b652b11afea7d9d86a978fa566 (diff) | |
| parent | 148587461954b544355bc808a89bfed1a70694e1 (diff) | |
| download | mariadb-git-24e452a208adebedce6a8a418265fced66bfb027.tar.gz | |
Merge with 5.1 & fixes to IGNORE handling
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 0c9ebc06749..c4ac9d6adfe 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1,5 +1,6 @@ -/* Copyright (c) 2000, 2010 Oracle and/or its affiliates. All rights reserved. - Copyright (C) 2011 Monty Program Ab. +/* + Copyright (c) 2003-2007 MySQL AB, 2009, 2010 Sun Microsystems, Inc. + Use is subject to license terms. 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 @@ -11,8 +12,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 +*/ /** |