Merge branch '11.0' into 11.1bb-11.1-release

1 files changed, 4 insertions, 2 deletions

diff --git a/strings/strings_def.h b/strings/strings_def.h
index c919861d8aa..39fdd1780a4 100644
--- a/strings/strings_def.h
+++ b/strings/strings_def.h
@@ -108,12 +108,14 @@ static inline const uchar *skip_trailing_space(const uchar *ptr,size_t len)
 int my_strnncollsp_nchars_generic(CHARSET_INFO *cs,
                                   const uchar *str1, size_t len1,
                                   const uchar *str2, size_t len2,
-                                  size_t nchars);
+                                  size_t nchars,
+                                  uint flags);
 
 int my_strnncollsp_nchars_generic_8bit(CHARSET_INFO *cs,
                                        const uchar *str1, size_t len1,
                                        const uchar *str2, size_t len2,
-                                       size_t nchars);
+                                       size_t nchars,
+                                       uint flags);
 
 uint my_8bit_charset_flags_from_data(CHARSET_INFO *cs);
 uint my_8bit_collation_flags_from_data(CHARSET_INFO *cs);