New "fill" function in charset_info_st structure

14 files changed, 45 insertions, 2 deletions

diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 37bf2aba509..e1cc0b6e8ab 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6258,7 +6258,8 @@ CHARSET_INFO my_charset_big5 =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
-
+    my_fill_8bit,
+    
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 48d5536a2cb..61f89e0a2cc 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -306,6 +306,7 @@ static CHARSET_INFO my_charset_bin_st =
     my_snprintf_8bit,		/* snprintf      */
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index 6397d3d902e..3e351732212 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -630,6 +630,7 @@ CHARSET_INFO my_charset_czech =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index d4eebdcb4a9..7a2fe48f4ab 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -8676,6 +8676,7 @@ CHARSET_INFO my_charset_euc_kr =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index b01053866be..c0baca808cb 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -5726,6 +5726,7 @@ CHARSET_INFO my_charset_gb2312 =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index c65c9f2123e..5db91d09cc8 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -9913,6 +9913,7 @@ CHARSET_INFO my_charset_gbk =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-latin1_de.c b/strings/ctype-latin1_de.c
index 6a5a9b78e8d..22aea5a2cad 100644
--- a/strings/ctype-latin1_de.c
+++ b/strings/ctype-latin1_de.c
@@ -448,6 +448,7 @@ CHARSET_INFO my_charset_latin1_de =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index e028a027484..d7d382a61c3 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -1000,7 +1000,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)
     return 0;
 
   case MY_SEQ_SPACES:
-    for (str++ ; str != end ; str++)
+    for ( ; str < end ; str++)
     {
       if (!my_isspace(cs,*str))
         break;
@@ -1010,3 +1010,9 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)
     return 0;
   }
 }
+
+void my_fill_8bit(CHARSET_INFO *cs __attribute__((unused)),
+		   char *s, uint l, int fill)
+{
+  bfill(s,l,fill);
+}
\ No newline at end of file
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 0408332ee30..b666bdf20d2 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4500,6 +4500,7 @@ CHARSET_INFO my_charset_sjis =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index ac959105736..5461173b766 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -722,6 +722,7 @@ CHARSET_INFO my_charset_tis620 =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 211b42db470..268a9e2296e 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8467,6 +8467,7 @@ CHARSET_INFO my_charset_ujis =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 3f859223a15..c4c12efe8b2 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -2001,6 +2001,7 @@ CHARSET_INFO my_charset_utf8 =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3089,6 +3090,7 @@ CHARSET_INFO my_charset_ucs2 =
     my_snprintf_ucs2,
     my_l10tostr_ucs2,
     my_ll10tostr_ucs2,
+    my_fill_8bit,
     my_strntol_ucs2,
     my_strntoul_ucs2,
     my_strntoll_ucs2,
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index b6e78368dde..f5074a4ec0e 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -666,6 +666,7 @@ CHARSET_INFO my_charset_win1250ch =
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
diff --git a/strings/ctype.c b/strings/ctype.c
index 891c3c2c882..f656c4318a3 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -2845,6 +2845,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -2892,6 +2893,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -2938,6 +2940,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -2984,6 +2987,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3031,6 +3035,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3077,6 +3082,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3123,6 +3129,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3169,6 +3176,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3216,6 +3224,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3262,6 +3271,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3308,6 +3318,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3354,6 +3365,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3400,6 +3412,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3446,6 +3459,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3492,6 +3506,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3539,6 +3554,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3585,6 +3601,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3632,6 +3649,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3679,6 +3697,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3725,6 +3744,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3771,6 +3791,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3817,6 +3838,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3863,6 +3885,7 @@ static CHARSET_INFO compiled_charsets[] = {
     my_snprintf_8bit,
     my_long10_to_str_8bit,
     my_longlong10_to_str_8bit,
+    my_fill_8bit,
     my_strntol_8bit,
     my_strntoul_8bit,
     my_strntoll_8bit,
@@ -3915,6 +3938,7 @@ static CHARSET_INFO compiled_charsets[] = {
     NULL,
     NULL,
     NULL,
+    NULL,
     NULL
   }
 };