diff options
| author | unknown <monty@mishka.local> | 2004-04-27 17:32:40 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-04-27 17:32:40 +0300 |
| commit | 39ec9e1e23409b9ddb0c9b7c5baff3d4877c11b6 (patch) | |
| tree | d120ae1415ec73524eea47c5900cc9bc5138c029 /mysys | |
| parent | 4f44862bda76461f92100bfe9053e2c62bdd9b53 (diff) | |
| download | mariadb-git-39ec9e1e23409b9ddb0c9b7c5baff3d4877c11b6.tar.gz | |
Fixed results for previous patch
Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed
client/mysqldump.c:
Added better default --debug option
mysql-test/r/show_check.result:
Fixed result after Type->Engine conversion
mysys/charset.c:
Don't give error if Index.xml doesn't exists
(If we can't find the character set, the later error will include the used patch to the Index.xml file)
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 80f62b06a3e..ccb8bdbe5bf 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -373,7 +373,7 @@ static my_bool my_read_charset_file(const char *filename, myf myflags) uint len; MY_STAT stat_info; - if (!my_stat(filename, &stat_info, MYF(MY_WME)) || + if (!my_stat(filename, &stat_info, MYF(myflags)) || ((len= (uint)stat_info.st_size) > MY_MAX_ALLOWED_BUF) || !(buf= (char *)my_malloc(len,myflags))) return TRUE; |