diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-27 17:12:44 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-27 17:12:44 +0300 |
| commit | ad6d95d3cb420557cfc7efa658181a8d20b4c154 (patch) | |
| tree | 984bb45ca187a6cc38c7132a9600d91515df564e /storage/myisam/mi_open.c | |
| parent | 9bc9855c16f815e71223398ef17cd6052becc44e (diff) | |
| parent | 7909541953de43c7b7d16513c8d612cfe405af67 (diff) | |
| download | mariadb-git-ad6d95d3cb420557cfc7efa658181a8d20b4c154.tar.gz | |
Merge with MySQL 5.1.50
- Changed to still use bcmp() in certain cases becasue
- Faster for short unaligneed strings than memcmp()
- Bettern when using valgrind
- Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems
- Changed code to use MariaDB version of select->skip_record()
- Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
Diffstat (limited to 'storage/myisam/mi_open.c')
| -rw-r--r-- | storage/myisam/mi_open.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c index 7436548c7e1..e4240dec90c 100644 --- a/storage/myisam/mi_open.c +++ b/storage/myisam/mi_open.c @@ -139,8 +139,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) my_errno= HA_ERR_NOT_A_TABLE; goto err; } - if (memcmp((uchar*) share->state.header.file_version, - (uchar*) myisam_file_magic, 4)) + if (bcmp(share->state.header.file_version, myisam_file_magic, 4)) { DBUG_PRINT("error",("Wrong header in %s",name_buff)); DBUG_DUMP("error_dump", share->state.header.file_version, |