diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 15:25:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 15:25:55 +0200 |
| commit | b069d19284b70ead3ceb62618acdc8ef93a2703e (patch) | |
| tree | 0d5f6764825d51db3b8a37c8043d837c06e3e086 /sql/item_geofunc.h | |
| parent | 1bc0b0b5245977172e2c3a3c64a42a2c4e762e06 (diff) | |
| parent | e7061f7e5a96c66cb2e0bf46bec7f6ff35801a69 (diff) | |
| download | mariadb-git-b069d19284b70ead3ceb62618acdc8ef93a2703e.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
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 a2a61758617..922593f8b91 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 Monty Program Ab. +/* 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()); |