database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/pem/work/mysql-4.1

Browse Source 
into mysql.com:/home/pem/work/mysql-5.0
This commit is contained in:
pem@mysql.com
2003-12-02 17:08:24 +01:00
parent e282c8cc6f 1be4a37fa2
commit 2c16ccdbe6
7 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@ -1611,10 +1611,6 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
err:
if (free_join)
{
JOIN *curr_join= (join->need_tmp&&join->tmp_join?
(join->tmp_join->error=join->error,join->tmp_join):
join);
thd->proc_info="end";
err= join->cleanup();
if (thd->net.report_error)