diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-06-17 12:41:20 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-06-17 12:41:20 +0300 |
| commit | b31987c1419fc6a3cae4313d0b60dcb828ad5f62 (patch) | |
| tree | 320ea6022db45038b1777190c1ba014fd7ba8247 /storage/myisam/myisamlog.c | |
| parent | 028bb395b747a505d3c94f8c4c33f3d7ef0e17a8 (diff) | |
| parent | af632d82d9fae2ddcd0e4c8aed5d67246165169e (diff) | |
| download | mariadb-git-b31987c1419fc6a3cae4313d0b60dcb828ad5f62.tar.gz | |
Merge mysql-trunk-bugfixing -> mysql-trunk-innodb
Diffstat (limited to 'storage/myisam/myisamlog.c')
| -rw-r--r-- | storage/myisam/myisamlog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/myisam/myisamlog.c b/storage/myisam/myisamlog.c index b2699d66f84..089e3480da6 100644 --- a/storage/myisam/myisamlog.c +++ b/storage/myisam/myisamlog.c @@ -382,18 +382,18 @@ static int examine_log(char * file_name, char **table_names) curr_file_info->show_name); if (my_b_read(&cache,(uchar*) head,2)) goto err; + buff= 0; file_info.name=0; file_info.show_name=0; file_info.record=0; - if (read_string(&cache,(uchar**) &file_info.name, - (uint) mi_uint2korr(head))) + if (read_string(&cache, &buff, (uint) mi_uint2korr(head))) goto err; { uint i; char *pos,*to; /* Fix if old DOS files to new format */ - for (pos=file_info.name; (pos=strchr(pos,'\\')) ; pos++) + for (pos=file_info.name=(char*)buff; (pos=strchr(pos,'\\')) ; pos++) *pos= '/'; pos=file_info.name; @@ -692,7 +692,7 @@ static int read_string(IO_CACHE *file, register uchar* *to, register uint length *to= 0; DBUG_RETURN(1); } - *((char*) *to+length)= '\0'; + *((uchar*) *to+length)= '\0'; DBUG_RETURN (0); } /* read_string */ |