Commit f9c2560f authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge

parents 0a7dfd01 9eea2470

mysql-test/mysql-test-run.sh

+6 −5
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ SLAVE_RUNNING=0 


[ -d $MY_TMP_DIR ]  || mkdir -p $MY_TMP_DIR



[ -z "$COLUMNS" ] && COLUMNS=80

E=`expr $COLUMNS - 8`

DASH72=`expr substr '________________________________________________________________________' 1 $E`



#++

# mysqld Environment Parameters

#--
@@ -113,6 +109,11 @@ TIME=/usr/bin/time 
TR=/usr/bin/tr

XARGS=`which xargs | head -1`



[ -z "$COLUMNS" ] && COLUMNS=80

E=`$EXPR $COLUMNS - 8`

#DASH72=`expr substr '________________________________________________________________________' 1 $E`

DASH72=`$ECHO '________________________________________________________________________'|$CUT -c 1-$E`



# on source dist, we pick up freshly build executables

# on binary, use what is installed

if [ x$SOURCE_DIST = x1 ] ; then
@@ -469,7 +470,7 @@ run_testcase () 
    fi



	timestr="$USERT $SYST $REALT"

	pname=`$EXPR substr "$tname                 " 1 16`

	pname=`$ECHO "$tname                 "|$CUT -c 1-16`

	$SETCOLOR_NORMAL && $ECHO -n "$pname          $timestr"

sql/filesort.cc

+0 −5
Original line number Diff line number Diff line
@@ -325,11 +325,6 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, 
    file->rnd_init();

    file->extra(HA_EXTRA_CACHE);	/* Quicker reads */

  }

  else if (quick_select)		// QQ For FULLTEXT

  {					// QQ Should be removed soon

    file->index_end();	

    select->quick->init();

  }



  for (;;)

  {

sql/sql_select.cc

+2 −2
Original line number Diff line number Diff line
@@ -2247,8 +2247,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) 
	{

	  /* Use quick key read if it's a constant and it's not used

	     with key reading */

	  if (tab->needed_reg == 0 && tab->type != JT_EQ_REF &&

	      (tab->type != JT_REF ||

	  if (tab->needed_reg == 0 && tab->type != JT_EQ_REF

	      && tab->type != JT_FT && (tab->type != JT_REF ||

	       (uint) tab->ref.key == tab->quick->index))

	  {

	    sel->quick=tab->quick;		// Use value from get_quick_...