diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
| commit | 87e3e67f434628768b5125fbab7e8862fa60da1a (patch) | |
| tree | df19b8bcac9988d83270ed1da05f765bfc4e8624 /sql/item_geofunc.h | |
| parent | 80da57cc4f0c717ee3e01ac5abccc859b88a2fbf (diff) | |
| parent | cee9ab9d85a8d75290b0d60bc7af26c8cf179a1d (diff) | |
| download | mariadb-git-87e3e67f434628768b5125fbab7e8862fa60da1a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item_geofunc.h')
| -rw-r--r-- | sql/item_geofunc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h index b72661fe054..6b991a1b643 100644 --- a/sql/item_geofunc.h +++ b/sql/item_geofunc.h @@ -1,8 +1,8 @@ #ifndef ITEM_GEOFUNC_INCLUDED #define ITEM_GEOFUNC_INCLUDED -/* Copyright (c) 2000, 2010 Oracle and/or its affiliates. - Copyright (C) 2011, 2015 MariaDB +/* Copyright (c) 2000, 2016 Oracle and/or its affiliates. + Copyright (C) 2011, 2016, MariaDB 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 @@ -259,7 +259,7 @@ public: if (args[i]->fixed && args[i]->field_type() != MYSQL_TYPE_GEOMETRY) { String str; - args[i]->print(&str, QT_ORDINARY); + args[i]->print(&str, QT_NO_DATA_EXPANSION); str.append('\0'); my_error(ER_ILLEGAL_VALUE_FOR_TYPE, MYF(0), "non geometric", str.ptr()); |