conf_to_src.c:

  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.
ctype-extra.c:
  Additional charsets were generated.


strings/ctype-extra.c:
  Additional charsets were generated.
strings/conf_to_src.c:
  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.

1 files changed, 2 insertions, 1 deletions

diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c
index 700b6a91070..8f7e40966b9 100644
--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@@ -22,7 +22,7 @@
 
 #define ROW_LEN		16
 #define ROW16_LEN	8
-#define MAX_BUF		16*1024
+#define MAX_BUF		64*1024
 
 static CHARSET_INFO all_charsets[256];
 
@@ -156,6 +156,7 @@ static int my_read_charset_file(const char *filename)
   }
   
   len=read(fd,buf,MAX_BUF);
+  DBUG_ASSERT(len < MAX_BUF);
   close(fd);
   
   if (my_parse_charset_xml(buf,len,add_collation))