diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-07-22 19:45:25 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-07-22 19:45:25 +0200 |
| commit | c1d1dc25dd9becb0bca736aeeb6fbb3c62413a71 (patch) | |
| tree | 78a316e4a3a79bd8722207b4a7fd355b3d7c0c3d /storage/connect/tabdos.cpp | |
| parent | decc23cbc2d0ece2217f3d70173cc4dd7088da5c (diff) | |
| download | mariadb-git-c1d1dc25dd9becb0bca736aeeb6fbb3c62413a71.tar.gz | |
- Modif avglen calculation and add AVG_ROW_LENGTH option to test
This is to get same test results on Linux and Windows
modified:
storage/connect/mysql-test/connect/r/part_file.result
storage/connect/mysql-test/connect/r/part_table.result
storage/connect/mysql-test/connect/t/part_file.test
storage/connect/mysql-test/connect/t/part_table.test
storage/connect/tabdos.cpp
Diffstat (limited to 'storage/connect/tabdos.cpp')
| -rw-r--r-- | storage/connect/tabdos.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/connect/tabdos.cpp b/storage/connect/tabdos.cpp index d1ef94c6000..d04e1c61dcd 100644 --- a/storage/connect/tabdos.cpp +++ b/storage/connect/tabdos.cpp @@ -1904,10 +1904,12 @@ int TDBDOS::GetMaxSize(PGLOBAL g) /* Estimate the number of lines in the table (if not known) by */ /* dividing the file length by average record length. */ /*****************************************************************/ + rec = ((PDOSDEF)To_Def)->Ending; + if (AvgLen <= 0) // No given average estimate - rec = EstimatedLength(g) + ((PDOSDEF)To_Def)->Ending; + rec += EstimatedLength(g); else // An estimate was given for the average record length - rec = (int)AvgLen; // Including line ending + rec += AvgLen; MaxSize = (len + rec - 1) / rec; |