database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
This commit is contained in:
hf@deer.mysql.r18.ru
2003-01-08 19:43:58 +04:00
parent a05b6e2456 bd5fa8d60e
commit 5a107871c3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/item_strfunc.cc
View File

@@ -2666,6 +2666,9 @@ Functions to concatinate various spatial objects
String *Item_func_point::val_str(String *str)
{
double x= args[0]->val();
double y= args[1]->val();
if ( (null_value = (args[0]->null_value ||
args[1]->null_value ||
str->realloc(1+4+8+8))))
@@ -2674,8 +2677,8 @@ String *Item_func_point::val_str(String *str)
str->length(0);
str->q_append((char)Geometry::wkbNDR);
str->q_append((uint32)Geometry::wkbPoint);
str->q_append((double)args[0]->val());
str->q_append((double)args[1]->val());
str->q_append(x);
str->q_append(y);
return str;
}
@@ -2707,11 +2710,10 @@ String *Item_func_spatial_collection::val_str(String *str)
for (i = 0; i < arg_count; ++i)
{
String *res = args[i]->val_str(&arg_value);
if (args[i]->null_value)
goto ret;
String *res = args[i]->val_str(&arg_value);
if ( coll_type == Geometry::wkbGeometryCollection )
{
/*