diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_qsort.c | 2 | ||||
| -rw-r--r-- | mysys/my_dup.c | 2 | ||||
| -rw-r--r-- | mysys/raid.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c index ed79aab6fd9..3db6fae0520 100644 --- a/mysys/mf_qsort.c +++ b/mysys/mf_qsort.c @@ -110,7 +110,7 @@ qsort_t qsort(void *base_ptr, size_t count, size_t size, qsort_cmp cmp) stack_ptr = stack + 1; #ifdef HAVE_purify /* The first element in the stack will be accessed for the last POP */ - stack[0].lo=stack[0].hi=0; + stack[0].low=stack[0].high=0; #endif pivot = (char *) my_alloca((int) size); ptr_cmp= size == sizeof(char*) && !((low - (char*) 0)& (sizeof(char*)-1)); diff --git a/mysys/my_dup.c b/mysys/my_dup.c index 2b3f8f9dd06..5191a3bed37 100644 --- a/mysys/my_dup.c +++ b/mysys/my_dup.c @@ -29,7 +29,7 @@ File my_dup(File file, myf MyFlags) { File fd; - char *filename; + const char *filename; DBUG_ENTER("my_dup"); DBUG_PRINT("my",("file: %d MyFlags: %d", MyFlags)); fd = dup(file); diff --git a/mysys/raid.cc b/mysys/raid.cc index 48aa5cdb134..2e17a2c3f58 100644 --- a/mysys/raid.cc +++ b/mysys/raid.cc @@ -420,8 +420,8 @@ IsRaid(File fd) RaidFd:: RaidFd(uint raid_type, uint raid_chunks, ulong raid_chunksize) :_raid_type(raid_type), _raid_chunks(raid_chunks), - _raid_chunksize(raid_chunksize), _position(0), _fd_vector(0), - _size(RAID_SIZE_UNKNOWN) + _raid_chunksize(raid_chunksize), _position(0), _size(RAID_SIZE_UNKNOWN), + _fd_vector(0) { DBUG_ENTER("RaidFd::RaidFd"); DBUG_PRINT("enter",("RaidFd_type: %u Disks: %u Chunksize: %d", |