Removing the duplicate copy of char_to_byte_length_safe().

Alexander Barkov · Alexander Barkov · commit e43156e1a679 · 2017-03-13T17:20:22.000+04:00
It appeared during a merge from 10.2 to bb-10.2-ext.
diff --git a/sql/item.h b/sql/item.h
@@ -96,13 +96,6 @@ enum precedence {
 
 typedef Bounds_checked_array<Item*> Ref_ptr_array;
 
-static inline uint32
-char_to_byte_length_safe(size_t char_length_arg, uint32 mbmaxlen_arg)
-{
-  ulonglong tmp= ((ulonglong) char_length_arg) * mbmaxlen_arg;
-  return tmp > UINT_MAX32 ? UINT_MAX32 : static_cast<uint32>(tmp);
-}
-
 bool mark_unsupported_function(const char *where, void *store, uint result);
 
 /* convenience helper for mark_unsupported_function() above */
diff --git a/sql/sql_type.h b/sql/sql_type.h
@@ -184,10 +184,10 @@ class DTCollation {
 
 
 static inline uint32
-char_to_byte_length_safe(uint32 char_length_arg, uint32 mbmaxlen_arg)
+char_to_byte_length_safe(size_t char_length_arg, uint32 mbmaxlen_arg)
 {
-   ulonglong tmp= ((ulonglong) char_length_arg) * mbmaxlen_arg;
-   return (tmp > UINT_MAX32) ? (uint32) UINT_MAX32 : (uint32) tmp;
+  ulonglong tmp= ((ulonglong) char_length_arg) * mbmaxlen_arg;
+  return tmp > UINT_MAX32 ? UINT_MAX32 : static_cast<uint32>(tmp);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -184,10 +184,10 @@ class DTCollation {`
`184`	`184`
`185`	`185`
`186`	`186`	`static inline uint32`
`187`		`-char_to_byte_length_safe(uint32 char_length_arg, uint32 mbmaxlen_arg)`
	`187`	`+char_to_byte_length_safe(size_t char_length_arg, uint32 mbmaxlen_arg)`
`188`	`188`	`{`
`189`		`- ulonglong tmp= ((ulonglong) char_length_arg) * mbmaxlen_arg;`
`190`		`- return (tmp > UINT_MAX32) ? (uint32) UINT_MAX32 : (uint32) tmp;`
	`189`	`+ ulonglong tmp= ((ulonglong) char_length_arg) * mbmaxlen_arg;`
	`190`	`+ return tmp > UINT_MAX32 ? UINT_MAX32 : static_cast<uint32>(tmp);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`/**`