diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-08 17:47:33 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-08 17:47:33 +0200 |
| commit | 4e523ad68dce768516f58823667ce0d2484101d0 (patch) | |
| tree | ddc6455bd49752f4483b2fbe513bd7eaac760e0a /sql/item_geofunc.h | |
| parent | 5e1777f921d1ed9a43687b1c1606f33154add5cf (diff) | |
| parent | e0d0554bac0015643fe882704efbedad5ff024f0 (diff) | |
| download | mariadb-git-4e523ad68dce768516f58823667ce0d2484101d0.tar.gz | |
weave merge from mysql-5.1 to mysql-5.5
Resolved an innodb conflict thanks to vasil.
Diffstat (limited to 'sql/item_geofunc.h')
| -rw-r--r-- | sql/item_geofunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h index 6145f72b665..c5c1eae2d39 100644 --- a/sql/item_geofunc.h +++ b/sql/item_geofunc.h @@ -1,7 +1,7 @@ #ifndef ITEM_GEOFUNC_INCLUDED #define ITEM_GEOFUNC_INCLUDED -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (c) 2000, 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 |