diff options
| author | unknown <brian@zim.(none)> | 2006-08-14 21:26:33 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-14 21:26:33 -0700 |
| commit | 882b770734c08e0e1ba1017a77bc053a481d9bec (patch) | |
| tree | 04925bd2f6ab329ac9b036249ab7f3ffb6d5ca08 /mysys | |
| parent | 7260fd704970478e9ee658c3c14e76923648edd6 (diff) | |
| parent | c235176ed12788a2ec292062dd33700e80fe6b0e (diff) | |
| download | mariadb-git-882b770734c08e0e1ba1017a77bc053a481d9bec.tar.gz | |
Merge zim.(none):/home/brian/mysql/dep-5.1
into zim.(none):/home/brian/mysql/remove-bdb-5.1
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/backup.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/federated_transactions.test:
Merge
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 */ |