Commit 513ef79d authored by unknown's avatar unknown
Browse files

Merge marko@build.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/marko/k/mysql-4.0
parents c36a75a8 99e3f21c

sql/sql_union.cc

+7 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) 
  TABLE_LIST *first_table=(TABLE_LIST *)lex->select_lex.table_list.first;

  TMP_TABLE_PARAM tmp_table_param;

  select_union *union_result;

  ha_rows examined_rows= 0;

  DBUG_ENTER("mysql_union");



  /* Fix tables 'to-be-unioned-from' list to point at opened tables */
@@ -202,6 +203,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) 
		     union_result);

    if (res)

      goto exit;

    examined_rows+= thd->examined_row_count;

    /* Needed for the following test and for records_at_start in next loop */

    table->file->info(HA_STATUS_VARIABLE);

    if (found_rows_for_union & sl->options)
@@ -263,7 +265,10 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) 
		       (ORDER*) NULL, NULL, (ORDER*) NULL,

		       thd->options, result);

      if (!res)

      {

	thd->limit_found_rows= (ulonglong)table->file->records + add_rows;

	thd->examined_row_count+= examined_rows;

      }

    }

  }