diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-09-01 21:18:29 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-09-01 21:18:29 +0300 |
| commit | 4692537f608bb69e8d02c4b102b4fb888f7bec12 (patch) | |
| tree | a3ce69921791c4f4ab4dccc4725545b2e8e54cdd /mysys/mf_iocache.c | |
| parent | 1a51fe363d3aec8a22e804b90e351ebe912ed837 (diff) | |
| download | mariadb-git-4692537f608bb69e8d02c4b102b4fb888f7bec12.tar.gz | |
Fixed non critical buffer overflow bug in open_binary_frm() that could cause ASSERT
Added more printing of errors to myisamchk.
mysys/mf_iocache.c:
Write error message if failed seek.
sql/table.cc:
Fixed buffer overflow bug:
- It's not enough to check for mysql_version to to detect partion indicator as the version may have been updated by mysql_upgrade.
storage/myisam/ha_myisam.cc:
Don't log same error twice.
Don't reset log_all_errors if it's set
storage/myisam/mi_check.c:
Fixed bug that caused repair() to not report error if called twice (as when doing retry)
More printing of errors.
storage/myisam/sort.c:
Set my_errno in case of out of memory errors.
Diffstat (limited to 'mysys/mf_iocache.c')
| -rw-r--r-- | mysys/mf_iocache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 3824669365f..bf7c208d4d2 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1744,7 +1744,7 @@ int my_b_flush_io_cache(IO_CACHE *info, */ if (!append_cache && info->seek_not_done) { /* File touched, do seek */ - if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0)) == + if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(info->myflags & MY_WME)) == MY_FILEPOS_ERROR) { UNLOCK_APPEND_BUFFER; |