diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-12-12 11:21:17 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-12-12 11:21:17 +0200 |
| commit | 8accdc996eadcaaf5932ff8c8edd23f727b59995 (patch) | |
| tree | b840a810dd26b1cdee8ba16f44d1663e204ce261 /storage | |
| parent | 662fb84a42695ddf64468d7990e7bd830165d6c2 (diff) | |
| parent | 608948a2d3f3d7dd7a0dfe070697b8601a19b333 (diff) | |
| download | mariadb-git-8accdc996eadcaaf5932ff8c8edd23f727b59995.tar.gz | |
Merge mysql-5.1-bugteam -> mysql-5.1-innodb
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 12 | ||||
| -rw-r--r-- | storage/myisam/mi_check.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 12557b75cc1..2650cc850a8 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -590,7 +590,11 @@ int ha_myisam::net_read_dump(NET* net) int data_fd = file->dfile; int error = 0; - my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)); + if (my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)) == MY_FILEPOS_ERROR) + { + error= my_errno; + goto err; + } for (;;) { ulong packet_len = my_net_read(net); @@ -626,7 +630,11 @@ int ha_myisam::dump(THD* thd, int fd) return ENOMEM; int error = 0; - my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)); + if (my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)) == MY_FILEPOS_ERROR) + { + error= my_errno; + goto err; + } for (; bytes_to_read > 0;) { size_t bytes = my_read(data_fd, buf, blocksize, MYF(MY_WME)); diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 8e3864d1c44..935465e7edf 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -1741,6 +1741,8 @@ err: MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || mi_open_datafile(info,share,name,-1)) got_error=1; + + param->retry_repair= 0; } } if (got_error) |