[Commits] Rev 2863: Fix buildbot failure in file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk/

Sergey Petrunya psergey at askmonty.org
Thu Nov 25 23:30:41 EET 2010


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

------------------------------------------------------------
revno: 2863
revision-id: psergey at askmonty.org-20101125213039-fpd6bbk08yayjck2
parent: psergey at askmonty.org-20101125113521-i8vi1jtcoxs1ipr5
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: maria-5.3-mwl128-dsmrr-cpk
timestamp: Fri 2010-11-26 00:30:39 +0300
message:
  Fix buildbot failure
=== modified file 'sql/multi_range_read.cc'
--- a/sql/multi_range_read.cc	2010-11-25 11:35:21 +0000
+++ b/sql/multi_range_read.cc	2010-11-25 21:30:39 +0000
@@ -834,10 +834,15 @@
       goto error;
     }
   }
-  
+  strategy_exhausted= FALSE;
+
   res= strategy->refill_buffer(TRUE);
-  if (res && res != HA_ERR_END_OF_FILE) //psergey-todo: remove EOF check here
-    goto error;
+  if (res)
+  {
+    if (res != HA_ERR_END_OF_FILE)
+      goto error;
+    strategy_exhausted= TRUE;
+  }
 
   /*
     If we have scanned through all intervals in *seq, then adjust *buf to 
@@ -1232,6 +1237,9 @@
 int DsMrr_impl::dsmrr_next(char **range_info)
 {
   int res;
+  if (strategy_exhausted)
+    return HA_ERR_END_OF_FILE;
+
   while ((res= strategy->get_next(range_info)) == HA_ERR_END_OF_FILE)
   {
     if ((res= strategy->refill_buffer(FALSE)))

=== modified file 'sql/multi_range_read.h'
--- a/sql/multi_range_read.h	2010-11-25 11:35:21 +0000
+++ b/sql/multi_range_read.h	2010-11-25 21:30:39 +0000
@@ -544,7 +544,10 @@
   bool is_mrr_assoc;
 
   Mrr_reader_factory reader_factory;
+
   Mrr_reader *strategy;
+  bool strategy_exhausted;
+
   Mrr_index_reader *index_strategy;
 
   /* The whole buffer space that we're using */



More information about the commits mailing list