item_strfunc.cc:

Fix

item_strfunc.cc:
Fix
58e00848 · bar@bar.mysql.r18.ru · 1172215b · 58e00848
Commit 58e00848 authored Feb 13, 2003 by bar@bar.mysql.r18.ru
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

sql/item_strfunc.cc sql/item_strfunc.cc +8 -8

No files found.
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2576,15 +2576,15 @@ String *Item_func_geometry_type::val_str(String *str)
 String *Item_func_envelope::val_str(String *str)
 {
-  String arg_val;
+  String *res = args[0]->val_str(str);
-  String *wkb = args[0]->val_str(&arg_val);
  Geometry geom;
-  null_value = args[0]->null_value ||
+  if ((null_value = args[0]->null_value ||
-               geom.create_from_wkb(wkb->ptr(),wkb->length()) ||
+               geom.create_from_wkb(res->ptr(),res->length())))
-               geom.envelope(str);
+    return 0;
-  return null_value ? 0 : str;
+  res->length(0);
+  return (null_value= geom.envelope(res)) ? 0 : res;
 }