Commit fafa4c5a authored by unknown's avatar unknown

conf_to_src.c:

  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.


strings/ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
strings/conf_to_src.c:
  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
parent a47bba1f
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define ROW_LEN 16 #define ROW_LEN 16
#define ROW16_LEN 8 #define ROW16_LEN 8
#define MAX_BUF 16*1024 #define MAX_BUF 64*1024
static CHARSET_INFO all_charsets[256]; static CHARSET_INFO all_charsets[256];
...@@ -154,6 +154,7 @@ static int my_read_charset_file(const char *filename) ...@@ -154,6 +154,7 @@ static int my_read_charset_file(const char *filename)
} }
len=read(fd,buf,MAX_BUF); len=read(fd,buf,MAX_BUF);
DBUG_ASSERT(len < MAX_BUF);
close(fd); close(fd);
if (my_parse_charset_xml(buf,len,add_collation)) if (my_parse_charset_xml(buf,len,add_collation))
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment