From: ramil
Date: February 5 2004 1:55pm
Subject: bk commit into 4.0 tree (ram:1.1708)
List-Archive: http://lists.mysql.com/internals/12057
Message-Id: <200402051355.i15DtTb7047925@gw.mysql.r18.ru>

Below is the list of changes that have just been committed into a local
4.0 repository of ram. When ram 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1708 04/02/05 17:55:27 ram@stripped +1 -0
  a fix (bug #2506: select_full_joins is increased without query execution)

  sql/sql_select.cc
    1.273 04/02/05 17:55:25 ram@stripped +11 -5
    a fix (bug #2506: select_full_joins is increased without query execution)

# 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:	ram
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/4.0.b2506

--- 1.272/sql/sql_select.cc	Fri Jan 30 13:46:29 2004
+++ 1.273/sql/sql_select.cc	Thu Feb  5 17:55:25 2004
@@ -2823,6 +2823,7 @@
 {
   uint i;
   SELECT_LEX *select_lex = &(join->thd->lex.select_lex);
+  bool stat= !(join->select_options & SELECT_DESCRIBE);
   DBUG_ENTER("make_join_readinfo");
 
   for (i=join->const_tables ; i < join->tables ; i++)
@@ -2907,7 +2908,8 @@
       {
 	select_lex->options|=QUERY_NO_GOOD_INDEX_USED;
 	tab->read_first_record= join_init_quick_read_record;
-	statistic_increment(select_range_check_count, &LOCK_status);
+	if (stat)
+	  statistic_increment(select_range_check_count, &LOCK_status);
       }
       else
       {
@@ -2916,24 +2918,28 @@
 	{
 	  if (tab->select && tab->select->quick)
 	  {
-	    statistic_increment(select_range_count, &LOCK_status);
+	    if (stat)
+	      statistic_increment(select_range_count, &LOCK_status);
 	  }
 	  else
 	  {
 	    select_lex->options|=QUERY_NO_INDEX_USED;
-	    statistic_increment(select_scan_count, &LOCK_status);
+	    if (stat)
+	      statistic_increment(select_scan_count, &LOCK_status);
 	  }
 	}
 	else
 	{
 	  if (tab->select && tab->select->quick)
 	  {
-	    statistic_increment(select_full_range_join_count, &LOCK_status);
+	    if (stat)
+	      statistic_increment(select_full_range_join_count, &LOCK_status);
 	  }
 	  else
 	  {
 	    select_lex->options|=QUERY_NO_INDEX_USED;
-	    statistic_increment(select_full_join_count, &LOCK_status);
+	    if (stat)
+	      statistic_increment(select_full_join_count, &LOCK_status);
 	  }
 	}
 	if (!table->no_keyread)