diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-04 19:28:38 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-04 19:28:38 +0100 |
| commit | 2e5a6f9eaabebedcf10f189427fb56577fc9780c (patch) | |
| tree | 4709d201720e18f147c369d52ae2cde47bec6b24 /innobase | |
| parent | 9f1fa169c59c29fa1d9c877efd14ffac5ba87448 (diff) | |
| parent | 85b1701ab7292eeee4ce4b253909ae68345be43c (diff) | |
| download | mariadb-git-2e5a6f9eaabebedcf10f189427fb56577fc9780c.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
Docs/Makefile.am:
Auto merged
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/Makefile.am:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/lib/mtr_io.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_handler.cc:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Manual merge with import of upstream yaSSL
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/os/os0file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 075005c3611..5e5c4b19eb0 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -1718,7 +1718,7 @@ os_file_set_size( } /* Print about progress for each 100 MB written */ - if ((current_size + n_bytes) / (ib_longlong)(100 * 1024 * 1024) + if ((ib_longlong) (current_size + n_bytes) / (ib_longlong)(100 * 1024 * 1024) != current_size / (ib_longlong)(100 * 1024 * 1024)) { fprintf(stderr, " %lu00", |