MDEV-8466 CAST works differently for DECIMAL/INT vs DOUBLE for empty strings

MDEV-8468 CAST and INSERT work differently for DECIMAL/INT vs DOUBLE for a string with trailing spaces

1 files changed, 12 insertions, 2 deletions

diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index a2cce862f1a..78c71d54b6d 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -366,13 +366,23 @@ int str2my_decimal(uint mask, const char *str, my_decimal *d, char **end)
 
 
 int str2my_decimal(uint mask, const char *from, uint length,
-                   CHARSET_INFO *charset, my_decimal *decimal_value);
+                   CHARSET_INFO *charset, my_decimal *decimal_value,
+                   const char **end);
+
+inline int str2my_decimal(uint mask, const char *from, uint length,
+                          CHARSET_INFO *charset, my_decimal *decimal_value)
+{
+  const char *end;
+  return str2my_decimal(mask, from, length, charset, decimal_value, &end);
+}
 
 #if defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
 inline
 int string2my_decimal(uint mask, const String *str, my_decimal *d)
 {
-  return str2my_decimal(mask, str->ptr(), str->length(), str->charset(), d);
+  const char *end;
+  return str2my_decimal(mask, str->ptr(), str->length(), str->charset(),
+                        d, &end);
 }