diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-28 01:13:10 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-28 01:13:10 +0300 |
| commit | d4e2209dac3859aa12b4dc1e9e4c8c9f75f23383 (patch) | |
| tree | 7b1fb8ee620b8fa1887a7dd8223b84d2dfdda183 /storage/archive/ha_archive.cc | |
| parent | 2f3d117ae374ee321152fbc3f00cd213eb6ab70f (diff) | |
| parent | 9eae1881b384592e8fc13a78000071a08fe7370f (diff) | |
| download | mariadb-git-d4e2209dac3859aa12b4dc1e9e4c8c9f75f23383.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- storage/archive/ha_archive.cc
Diffstat (limited to 'storage/archive/ha_archive.cc')
| -rw-r--r-- | storage/archive/ha_archive.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index c0c3c83a210..d902a4557dc 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1555,7 +1555,7 @@ int ha_archive::info(uint flag) stats.data_file_length= file_stat.st_size; stats.index_file_length=0; stats.mean_rec_length= stats.records ? - stats.data_file_length / stats.records : table->s->reclength; + ulong(stats.data_file_length / stats.records) : table->s->reclength; } } |