database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

post-merged fixing

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2002-06-05 22:05:08 +03:00
parent 5dbcac1d6d
commit 27a2dac9fc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@@ -2480,7 +2480,7 @@ make_simple_join(JOIN *join,TABLE *tmp_table)
join->send_records=(ha_rows) 0;
join->group=0;
join->do_send_rows = 1;
join->row_limit=join->thd->select_limit;
join->row_limit=join->unit->select_limit_cnt;
join_tab->cache.buff=0; /* No cacheing */
join_tab->table=tmp_table;
@@ -7119,7 +7119,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
/* Don't log this into the slow query log */
select_lex->options&= ~(QUERY_NO_INDEX_USED | QUERY_NO_GOOD_INDEX_USED);
thd->offset_limit=0;
join->unit->offset_limit_cnt= 0;
if (thd->lex.select == select_lex)
{
field_list.push_back(new Item_empty_string("table",NAME_LEN));