diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-11-21 21:15:48 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-11-21 21:15:48 +0200 |
| commit | faa0c00eba05bc549afa26d6b8c22767384d3cf1 (patch) | |
| tree | 3a8cc6b267e12ab825770b0f18f3a66f0cb1877f /sql/spatial.cc | |
| parent | 789340bc5fc3b996f79593442e116554d52f84f2 (diff) | |
| parent | fe63e095816a744950e3a3f6d978f074fd3fcd93 (diff) | |
| download | mariadb-git-faa0c00eba05bc549afa26d6b8c22767384d3cf1.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
sql/ha_federated.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/spatial.cc')
| -rw-r--r-- | sql/spatial.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc index ca9615236e0..e91653f79d5 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -1793,7 +1793,7 @@ bool Gis_geometry_collection::get_data_as_wkt(String *txt, geom->set_data_ptr(data, (uint) (m_data_end - data)); if (geom->as_wkt(txt, &data)) return 1; - if (txt->append(",", 1, 512)) + if (txt->append(STRING_WITH_LEN(","), 512)) return 1; } txt->length(txt->length() - 1); |