diff options
author | unknown <bar@mysql.com> | 2006-04-06 10:17:01 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2006-04-06 10:17:01 +0500 |
commit | fafa4c5ab4ff2466aeac743dc6702208cfd217fb (patch) | |
tree | c5f42a8857e6472d5f0872e71b87e377de3d2851 /strings/conf_to_src.c | |
parent | a47bba1f250f9baa5d81c180c59e88e15d8c4f35 (diff) | |
download | mariadb-git-fafa4c5ab4ff2466aeac743dc6702208cfd217fb.tar.gz |
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.
Diffstat (limited to 'strings/conf_to_src.c')
-rw-r--r-- | strings/conf_to_src.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index 93088bc7512..505bf154bec 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]; @@ -154,6 +154,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)) |