diff options
author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-19 19:45:03 +0200 |
---|---|---|
committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-19 19:45:03 +0200 |
commit | db07956b3514fe8ef4699f6d8f569a397b04c769 (patch) | |
tree | c427155c4d08779b3d3eaef7d24cee213edc0943 /sql | |
parent | 31b748a4ef671d5da15b58363dea374aa4facc27 (diff) | |
parent | a08fdfcbd7e90bbac674092f3ad9c024e42a386e (diff) | |
download | mariadb-git-db07956b3514fe8ef4699f6d8f569a397b04c769.tar.gz |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b596d27b5af..05551980309 100644 --- a/sql/sql_select.cc +++ b/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 |