database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into mashka.mysql.fi:/home/my/mysql-4.0


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2003-08-13 13:26:52 +03:00
parent 06451ae437 74bab1fe02
commit 5c9e0cdc53
6 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@ -972,10 +972,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
group ? group : order,
select_limit,
thd->select_limit))
{
if (!join.join_tab[join.const_tables].select->quick)
goto err;
}
goto err;
}
join.having=having; // Actually a parameter
thd->proc_info="Sending data";