After merge fixes

Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)

1 files changed, 7 insertions, 6 deletions

diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index 1a07a5eba7e..8aea7358a9c 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -379,10 +379,11 @@ static int my_strnxfrm_czech(CHARSET_INFO *cs __attribute__((unused)),
 #define EXAMPLE
 
 static my_bool my_like_range_czech(CHARSET_INFO *cs __attribute__((unused)),
-                            const char *ptr,uint ptr_length,
-                            int escape, int w_one, int w_many,
-		            uint res_length, char *min_str,char *max_str,
-		            uint *min_length,uint *max_length)
+				   const char *ptr,uint ptr_length,
+				   pbool escape, pbool w_one, pbool w_many,
+				   uint res_length, char *min_str,
+				   char *max_str,
+				   uint *min_length,uint *max_length)
 {
 #ifdef EXAMPLE
   uchar value;
@@ -599,8 +600,8 @@ int my_strnncollsp_czech(CHARSET_INFO * cs,
 			const uchar *s, uint slen, 
 			const uchar *t, uint tlen)
 {
-  for ( ; slen && my_isspace(cs, s[slen-1]) ; slen--);
-  for ( ; tlen && my_isspace(cs, t[tlen-1]) ; tlen--);
+  for ( ; slen && s[slen-1] == ' ' ; slen--);
+  for ( ; tlen && t[tlen-1] == ' ' ; tlen--);
   return my_strnncoll_czech(cs,s,slen,t,tlen);
 }