diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:05:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:05:26 +0200 |
| commit | 872649c7baab3a9f7efdda78e49c4bc7dd481d91 (patch) | |
| tree | 4fffb1a99ca36ccea65e64bcaa81293c40e7539f /sql/item_geofunc.h | |
| parent | 4995bcffaded6a02106632fb8f259cd3d9048dc4 (diff) | |
| parent | 4f1ad43992d75676687f29da96dd7c4147247a8f (diff) | |
| download | mariadb-git-872649c7baab3a9f7efdda78e49c4bc7dd481d91.tar.gz | |
Merge branch '5.5' into 10.0
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 94be38e26ee..62d2198e221 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 @@ -191,7 +191,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()); |