diff options
author | Evgeny Potemkin <epotemkin@mysql.com> | 2009-11-24 18:26:13 +0300 |
---|---|---|
committer | Evgeny Potemkin <epotemkin@mysql.com> | 2009-11-24 18:26:13 +0300 |
commit | 438b795ff7438d6bb070a67c94ca337c9a99c3c6 (patch) | |
tree | 6e715efd003d16cfc130e158eb707c3c7249c158 /sql/item_geofunc.cc | |
parent | 049dc018dab45229c21d38dd82eaff79eb433f6a (diff) | |
parent | 726e83907cea41206bb1f4333b55c26f467b90ab (diff) | |
download | mariadb-git-438b795ff7438d6bb070a67c94ca337c9a99c3c6.tar.gz |
Manual merge of the fix for bug#43668.
Diffstat (limited to 'sql/item_geofunc.cc')
-rw-r--r-- | sql/item_geofunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 3c5990eb359..8c38cb2a859 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -511,8 +511,8 @@ err: longlong Item_func_spatial_rel::val_int() { DBUG_ASSERT(fixed == 1); - String *res1= args[0]->val_str(&tmp_value1); - String *res2= args[1]->val_str(&tmp_value2); + String *res1= args[0]->val_str(&cmp.value1); + String *res2= args[1]->val_str(&cmp.value2); Geometry_buffer buffer1, buffer2; Geometry *g1, *g2; MBR mbr1, mbr2; |