item_strfunc.cc:

  Unnesessary copying was fixed


sql/item_strfunc.cc:
  Unnesessary copying was fixed

1 files changed, 3 insertions, 9 deletions

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index f810afa3cfa..3b67fd371a4 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -975,16 +975,10 @@ String *Item_func_right::val_str(String *str)
   if (res->length() <= (uint) length)
     return res; /* purecov: inspected */
 
-  /*
-    As far "res" contains at least "length" bytes
-    (according to the above condition and return),
-    the below statement is safe. res->numchars() can 
-    never return a value more than "length".
-  */
-  uint start=res->numchars()-(uint) length;
-  if (!start)
+  uint start=res->numchars();
+  if (start <= (uint) length)
     return res;
-  start=res->charpos(start);
+  start=res->charpos(start - (uint) length);
   tmp_value.set(*res,start,res->length()-start);
   return &tmp_value;
 }