MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Petrunia Date:September 12 2006 10:17am
Subject:bk commit into 5.2 tree (sergefp:1.2156)
View as plain text  
Below is the list of changes that have just been committed into a local
5.2 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-12 13:17:48+03:00, sergefp@stripped +3 -0
  WL#2475 "Batched range read functions for MyISAM/InnoDb"
   - trivial code cleanups

  sql/handler.cc@stripped, 2006-09-12 13:17:17+03:00, sergefp@stripped +0 -3
    WL#2475 "Batched range read functions for MyISAM/InnoDb"
     - trivial code cleanups

  sql/mysqld.cc@stripped, 2006-09-12 13:17:18+03:00, sergefp@stripped +1 -1
    WL#2475 "Batched range read functions for MyISAM/InnoDb"
     - trivial code cleanups

  sql/opt_range.cc@stripped, 2006-09-12 13:17:18+03:00, sergefp@stripped +0 -1
    WL#2475 "Batched range read functions for MyISAM/InnoDb"
     - trivial code cleanups

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pslp.mylan
# Root:	/home/psergey/mysql-5.2-mymrr-03

--- 1.222/sql/handler.cc	2006-09-12 13:17:56 +03:00
+++ 1.223/sql/handler.cc	2006-09-12 13:17:56 +03:00
@@ -2912,7 +2912,6 @@
   cost->zero();
   cost->avg_io_cost= 1; // Assume random seeks
 
-  // TODO: Special handling for (flags & HA_MRR_SINGLEPOINT) case
   /* Produce the same cost as non-MRR code does */
   if (*flags & HA_MRR_INDEX_ONLY)
     cost->io_count= index_only_read_time(keyno, n_rows);
@@ -3239,7 +3238,6 @@
     
   if ((rowids_buf_cur == rowids_buf_last))
   {
-    fprintf(stderr, "****REFILL****\n");    
     h->rnd_end();
     if (h->extra(HA_EXTRA_KEYREAD) ||
         h->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
@@ -3256,7 +3254,6 @@
 
     if (h->mrr_restore_scan)
     {
-      fprintf(stderr, "** SCAN RESTORE **\n");
       h->mrr_restore_scan_res= 
         h->index_read(h->table->record[0], last_idx_tuple,
                       mrr_key->key_length + h->ref_length, 

--- 1.543/sql/mysqld.cc	2006-09-12 13:17:56 +03:00
+++ 1.544/sql/mysqld.cc	2006-09-12 13:17:56 +03:00
@@ -6157,7 +6157,7 @@
    (gptr*) &global_system_variables.read_rnd_buff_size,
    (gptr*) &max_system_variables.read_rnd_buff_size, 0,
    GET_ULONG, REQUIRED_ARG, 256*1024L, 64 /*IO_SIZE*2+MALLOC_OVERHEAD*/ ,
-   ~0L, MALLOC_OVERHEAD, 1 /* <-- psergey */, 0},
+   ~0L, MALLOC_OVERHEAD, 1 /* Small lower limit to be able to test MRR */, 0},
   {"record_buffer", OPT_RECORD_BUFFER,
    "Alias for read_buffer_size",
    (gptr*) &global_system_variables.read_buff_size,

--- 1.207/sql/opt_range.cc	2006-09-12 13:17:56 +03:00
+++ 1.208/sql/opt_range.cc	2006-09-12 13:17:56 +03:00
@@ -8783,7 +8783,6 @@
       /* Check if this range tree can be used for prefix retrieval. */
       bool dummy1;
       COST_VECT dummy2;
-      //psergey:todo: see if we can replace this: v v 
       cur_quick_prefix_records= check_quick_select(param, cur_param_idx, 
                                                    FALSE /*don't care*/, 
                                                    cur_index_tree,
Thread
bk commit into 5.2 tree (sergefp:1.2156)Sergey Petrunia12 Sep