Commit ea087c4f authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
parents cb282ee5 1086e7c5

mysql-test/mysql-test-run.sh

+2 −0
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ start_master() 
  	    --server-id=1  \

          --basedir=$MY_BASEDIR \

          --port=$MASTER_MYPORT \

          --local-infile \

          --exit-info=256 \

          --core \

          --datadir=$MASTER_MYDDIR \
@@ -749,6 +750,7 @@ start_master() 
          --server-id=1 --rpl-recovery-rank=1 \

          --basedir=$MY_BASEDIR --init-rpl-role=master \

          --port=$MASTER_MYPORT \

          --local-infile \

          --datadir=$MASTER_MYDDIR \

          --pid-file=$MASTER_MYPID \

          --socket=$MASTER_MYSOCK \

mysql-test/r/select_found.result

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ a b 
select found_rows();

FOUND_ROWS()

8

select SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS * from t1 limit 1;

a	b

1	2

select found_rows();

FOUND_ROWS()

8

select SQL_CALC_FOUND_ROWS * from t1 order by b desc limit 1;

a	b

8	9

mysql-test/t/select_found.test

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ select SQL_CALC_FOUND_ROWS * from t1; 
select found_rows();

select SQL_CALC_FOUND_ROWS * from t1 limit 1;

select found_rows();

select SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS * from t1 limit 1;

select found_rows();

select SQL_CALC_FOUND_ROWS * from t1 order by b desc limit 1;

select found_rows();

select SQL_CALC_FOUND_ROWS distinct b from t1 limit 1;

sql/sql_select.cc

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, 
  TABLE		*tmp_table;

  int		error, tmp_error;

  bool		need_tmp,hidden_group_fields;

  bool		simple_order,simple_group,no_order, skip_sort_order;

  bool		simple_order,simple_group,no_order, skip_sort_order, buffer_result;

  Item::cond_result cond_value;

  SQL_SELECT	*select;

  DYNAMIC_ARRAY keyuse;
@@ -201,6 +201,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, 
  /* Check that all tables, fields, conds and order are ok */



  select_distinct=test(select_options & SELECT_DISTINCT);

  buffer_result=test(select_options & OPTION_BUFFER_RESULT) && !test(select_options & OPTION_FOUND_ROWS);

  tmp_table=0;

  select=0;

  no_order=skip_sort_order=0;
@@ -546,8 +547,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, 


  need_tmp= (join.const_tables != join.tables &&

	     ((select_distinct || !simple_order || !simple_group) ||

	      (group && order) ||

	      test(select_options & OPTION_BUFFER_RESULT)));

	      (group && order) || buffer_result));



  // No cache for MATCH

  make_join_readinfo(&join,