Commit f4df5cd2 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Change storage of execution flags from thd->options to thd->lex.options

parent 1ce0e50f

sql/sql_delete.cc

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit, 
  /* If running in safe sql mode, don't allow updates without keys */

  if (!table->quick_keys)

  {

    thd->options|=OPTION_NO_INDEX_USED;

    thd->lex.options|=OPTION_NO_INDEX_USED;

    if ((thd->options & OPTION_SAFE_UPDATES) && limit == HA_POS_ERROR)

    {

      delete select;

sql/sql_parse.cc

+3 −2
Original line number Diff line number Diff line
@@ -826,7 +826,8 @@ bool do_command(THD *thd) 
  if (!thd->user_time)

  {

    if ((ulong) (thd->start_time - thd->time_after_lock) > long_query_time ||

	((thd->options & (OPTION_NO_INDEX_USED | OPTION_NO_GOOD_INDEX_USED)) &&

	((thd->lex.options &

	  (OPTION_NO_INDEX_USED | OPTION_NO_GOOD_INDEX_USED)) &&

	 (specialflag & SPECIAL_LONG_LOG_FORMAT)))

    {

      long_query_count++;
@@ -855,7 +856,7 @@ mysql_execute_command(void) 
{

  int	res=0;

  THD	*thd=current_thd;

  LEX	*lex=current_lex;

  LEX	*lex= &thd->lex;

  TABLE_LIST *tables=(TABLE_LIST*) lex->table_list.first;

  DBUG_ENTER("mysql_execute_command");

sql/sql_select.cc

+3 −3
Original line number Diff line number Diff line
@@ -2420,7 +2420,7 @@ make_join_readinfo(JOIN *join,uint options) 
      /* These init changes read_record */

      if (tab->use_quick == 2)

      {

	join->thd->options|=OPTION_NO_GOOD_INDEX_USED;

	join->thd->lex.options|=OPTION_NO_GOOD_INDEX_USED;

	tab->read_first_record= join_init_quick_read_record;

	statistic_increment(select_range_check_count, &LOCK_status);

      }
@@ -2435,7 +2435,7 @@ make_join_readinfo(JOIN *join,uint options) 
	  }

	  else

	  {

	    join->thd->options|=OPTION_NO_INDEX_USED;

	    join->thd->lex.options|=OPTION_NO_INDEX_USED;

	    statistic_increment(select_scan_count, &LOCK_status);

	  }

	}
@@ -2447,7 +2447,7 @@ make_join_readinfo(JOIN *join,uint options) 
	  }

	  else

	  {

	    join->thd->options|=OPTION_NO_INDEX_USED;

	    join->thd->lex.options|=OPTION_NO_INDEX_USED;

	    statistic_increment(select_full_join_count, &LOCK_status);

	  }

	}

sql/sql_update.cc

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields, 
  /* If running in safe sql mode, don't allow updates without keys */

  if (!table->quick_keys)

  {

    thd->options|=OPTION_NO_INDEX_USED;

    thd->lex.options|=OPTION_NO_INDEX_USED;

    if ((thd->options & OPTION_SAFE_UPDATES) && limit == HA_POS_ERROR)

    {

      delete select;