merge with 3.23.53 (only code cleanup and new test case)

Docs/manual.texi:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/r/binary.result:
  merge with 3.23.53
sql/item_strfunc.h:
  Code cleanup

1 files changed, 5 insertions, 1 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 3bbec149e9c..181aa8fb6ba 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -486,7 +486,11 @@ public:
   Item_func_binary(Item *a) :Item_str_func(a) {}
   const char *func_name() const { return "binary"; }
   String *val_str(String *a)
-  { a=args[0]->val_str(a); null_value=args[0]->null_value; return a; }
+  {
+    String *tmp=args[0]->val_str(a);
+    null_value=args[0]->null_value;
+    return tmp;
+   }
   void fix_length_and_dec() { binary=1; max_length=args[0]->max_length; }
   void print(String *str) { print_op(str); }
 };