[Commits] Rev 2865: Fix buildbot failure: keep rowid_buf_elem_size to its original value, otherwise in file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk-r2/

Sergey Petrunya psergey at askmonty.org
Sun Nov 28 22:55:10 EET 2010


At file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk-r2/

------------------------------------------------------------
revno: 2865
revision-id: psergey at askmonty.org-20101128205508-mylmctvyuqchpfe3
parent: psergey at askmonty.org-20101126124546-s4wc5luysfgbcj12
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: maria-5.3-mwl128-dsmrr-cpk-r2
timestamp: Sun 2010-11-28 23:55:08 +0300
message:
  Fix buildbot failure: keep rowid_buf_elem_size to its original value, otherwise 
  subsequent asserts have the wrong meaning.
=== modified file 'sql/multi_range_read.cc'
--- a/sql/multi_range_read.cc	2010-11-26 12:45:46 +0000
+++ b/sql/multi_range_read.cc	2010-11-28 20:55:08 +0000
@@ -1054,14 +1054,15 @@
   */
   uint parts= my_count_bits(key_tuple_map);
   ulong rpc;
+  ulonglong rowids_size;
   if ((rpc= key_info->rec_per_key[parts - 1]))
   {
-    rowid_buf_elem_size *= rpc;
+    rowids_size= rowid_buf_elem_size * rpc;
   }
 
   double fraction_for_rowids=
-    (ulonglong2double(rowid_buf_elem_size) / 
-     (ulonglong2double(rowid_buf_elem_size) + key_buff_elem_size));
+    (ulonglong2double(rowids_size) / 
+     (ulonglong2double(rowids_size) + key_buff_elem_size));
 
   size_t bytes_for_rowids= 
     round(fraction_for_rowids * (full_buf_end - full_buf));



More information about the commits mailing list