diff options
author | unknown <serg@serg.mylan> | 2005-03-09 14:09:06 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-03-09 14:09:06 +0100 |
commit | 944de39dff69a1c0110855ee4a8393355fae9e65 (patch) | |
tree | 4625d7f51e27bb495a5f571cfcad95a20d34e4a9 /innobase/ut | |
parent | 9eb459b2a14a727de7aa86699e00b402aff83d6f (diff) | |
parent | 29b304eb112f1b8a8aa18155df65fa8a74e58d0b (diff) | |
download | mariadb-git-944de39dff69a1c0110855ee4a8393355fae9e65.tar.gz |
merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/page0page.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'innobase/ut')
-rw-r--r-- | innobase/ut/ut0ut.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c index 1fffd08c718..1be5939303a 100644 --- a/innobase/ut/ut0ut.c +++ b/innobase/ut/ut0ut.c @@ -454,7 +454,7 @@ ut_copy_file( len < (long) sizeof buf ? (size_t) len : sizeof buf; size_t size = fread(buf, 1, maxs, src); fwrite(buf, 1, size, dest); - len -= size; + len -= (long) size; if (size < maxs) { break; } |