diff options
| author | unknown <brian@zim.(none)> | 2006-08-14 14:45:48 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-14 14:45:48 -0700 |
| commit | cd066443944c3baa65b5b033e43f583e9aab1b7e (patch) | |
| tree | 94f980737df52249aeba04b861e3511e3766b96f /mysys | |
| parent | 03830dd6097d462d1a680e6ced7cfa94ae65db07 (diff) | |
| download | mariadb-git-cd066443944c3baa65b5b033e43f583e9aab1b7e.tar.gz | |
Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB.
libmysqld/CMakeLists.txt:
Fix for build for BDB
mysys/base64.c:
Removed warning
mysys/my_pread.c:
Removed warning
sql-common/my_time.c:
Removed Warning
sql/CMakeLists.txt:
Editing for BDB
storage/csv/ha_tina.cc:
Removed warning
storage/myisam/ft_parser.c:
Removed warning
storage/myisam/mi_delete_all.c:
Removed unused variable
storage/myisam/mi_packrec.c:
Removed unused variable
win/README:
Fixed docs on Windows BDB
win/configure.js:
Removed function call to add support for building BDB
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/base64.c | 2 | ||||
| -rw-r--r-- | mysys/my_pread.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/base64.c b/mysys/base64.c index 610797dd2ce..fb51bdb3a60 100644 --- a/mysys/base64.c +++ b/mysys/base64.c @@ -42,7 +42,7 @@ base64_needed_encoded_length(int length_of_data) int base64_needed_decoded_length(int length_of_encoded_data) { - return ceil(length_of_encoded_data * 3 / 4); + return (int)ceil(length_of_encoded_data * 3 / 4); } diff --git a/mysys/my_pread.c b/mysys/my_pread.c index ac52895efe9..978366e57e5 100644 --- a/mysys/my_pread.c +++ b/mysys/my_pread.c @@ -46,7 +46,7 @@ uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset, before seeking to the given offset */ - error= (old_offset= lseek(Filedes, 0L, MY_SEEK_CUR)) == -1L || + error= (old_offset= (off_t)lseek(Filedes, 0L, MY_SEEK_CUR)) == -1L || lseek(Filedes, offset, MY_SEEK_SET) == -1L; if (!error) /* Seek was successful */ @@ -121,7 +121,7 @@ uint my_pwrite(int Filedes, const byte *Buffer, uint Count, my_off_t offset, As we cannot change the file pointer, we save the old position, before seeking to the given offset */ - error= ((old_offset= lseek(Filedes, 0L, MY_SEEK_CUR)) == -1L || + error= ((old_offset= (off_t)lseek(Filedes, 0L, MY_SEEK_CUR)) == -1L || lseek(Filedes, offset, MY_SEEK_SET) == -1L); if (!error) /* Seek was successful */ |