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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

mysql-test/r/select_found.result

@@ -183,4 +183,9 @@ titre	numeropost	maxnumrep
 SELECT FOUND_ROWS();
 FOUND_ROWS()
 3
+SELECT SQL_CALC_FOUND_ROWS * FROM t1 ORDER BY numeropost  LIMIT 0;
+titre	numeropost	maxnumrep
+SELECT FOUND_ROWS();
+FOUND_ROWS()
+3
 drop table t1;

mysql-test/t/select_found.test

@@ -90,4 +90,6 @@ SELECT SQL_CALC_FOUND_ROWS * FROM t1 WHERE numeropost > 1  LIMIT 0;
 SELECT FOUND_ROWS();
 SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 0;
 SELECT FOUND_ROWS();
+SELECT SQL_CALC_FOUND_ROWS * FROM t1 ORDER BY numeropost  LIMIT 0;
+SELECT FOUND_ROWS();
 drop table t1;

sql/sql_select.cc

@@ -324,7 +324,7 @@ JOIN::prepare(TABLE_LIST *tables_init,
   this->group= group_list != 0;
   row_limit= ((select_distinct || order || group_list) ? HA_POS_ERROR :
 	      unit->select_limit_cnt);
-  do_send_rows = (row_limit) ? 1 : 0;
+  do_send_rows = (unit->select_limit_cnt) ? 1 : 0;
   this->unit= unit;
 
 #ifdef RESTRICTED_GROUP