[Commits] Rev 2825: Remove garbage comments, coding style conformance (no functional changes). in file:///home/psergey/dev2/maria-5.3-dsmrr-cpk-r5/

Sergey Petrunya psergey at askmonty.org
Sun Sep 12 12:21:27 EEST 2010


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

------------------------------------------------------------
revno: 2825
revision-id: psergey at askmonty.org-20100912092125-a0q9hotxckgnkomz
parent: psergey at askmonty.org-20100911175643-9eeda6siohonp8cr
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: maria-5.3-dsmrr-cpk-r5
timestamp: Sun 2010-09-12 13:21:25 +0400
message:
  Remove garbage comments, coding style conformance (no functional changes).
=== modified file 'sql/multi_range_read.cc'
--- a/sql/multi_range_read.cc	2010-09-11 17:56:43 +0000
+++ b/sql/multi_range_read.cc	2010-09-12 09:21:25 +0000
@@ -942,9 +942,9 @@
 
   key_buffer.sort((qsort2_cmp)DsMrr_impl::key_tuple_cmp, (void*)this);
   
-  //psergey4: cur_range_info will point to range-info bytes.
   key_buffer.setup_reading(&cur_index_tuple, key_size_in_keybuf,
-                           is_mrr_assoc? (uchar**)&cur_range_info: NULL, sizeof(void*));
+                           is_mrr_assoc? (uchar**)&cur_range_info: NULL,
+                           sizeof(void*));
 
   last_identical_key_ptr= NULL;
   in_identical_keys_range= FALSE;
@@ -1004,8 +1004,7 @@
     {
       continue;
     }
-    memcpy(range_info_arg, cur_range_info, sizeof(void*)); //psergey4: this copyies junk there
-
+    memcpy(range_info_arg, cur_range_info, sizeof(void*));
     return 0;
   }
   
@@ -1209,12 +1208,10 @@
     if (is_mrr_assoc)
     {
       memcpy(range_info, rowids_range_id, sizeof(uchar*));
-      //psergey5: memcpy(&cur_range_info, rowids_range_id, sizeof(uchar*)); // psergey: ???
     }
 
     if (h2->mrr_funcs.skip_record &&
-	h2->mrr_funcs.skip_record(h2->mrr_iter, /* psergey5 (char *)
-        cur_range_info */ *range_info, rowid))
+	h2->mrr_funcs.skip_record(h2->mrr_iter, *range_info, rowid))
       continue;
 
     res= h->ha_rnd_pos(table->record[0], rowid);



More information about the commits mailing list