1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2002-11-06 22:40:45 +02:00
commit 1799ae1e70
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_select.cc
View File

@ -444,7 +444,7 @@ JOIN::optimize()
best_read > (double) thd->variables.max_join_size && best_read > (double) thd->variables.max_join_size &&
!(select_options & SELECT_DESCRIBE)) !(select_options & SELECT_DESCRIBE))
{ /* purecov: inspected */ { /* purecov: inspected */
result->send_error(ER_TOO_BIG_SELECT,ER(ER_TOO_BIG_SELECT)); /* purecov: inspected */ my_message(ER_TOO_BIG_SELECT, ER(ER_TOO_BIG_SELECT), MYF(0));
error= 1; /* purecov: inspected */ error= 1; /* purecov: inspected */
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
@ -670,10 +670,7 @@ JOIN::exec()
if (!having || having->val_int()) if (!having || having->val_int())
{ {
if (do_send_rows && result->send_data(fields_list)) if (do_send_rows && result->send_data(fields_list))
{
result->send_error(0,NullS); /* purecov: inspected */
error= 1; error= 1;
}
else else
error= (int) result->send_eof(); error= (int) result->send_eof();
} }
@ -1092,12 +1089,13 @@ err:
thd->limit_found_rows = join->send_records; thd->limit_found_rows = join->send_records;
thd->examined_row_count = join->examined_rows; thd->examined_row_count = join->examined_rows;
thd->proc_info="end"; thd->proc_info="end";
int error= (fake_select_lex?0:join->cleanup(thd)) || thd->net.report_error; int error= (fake_select_lex?join->error:join->cleanup(thd)) ||
thd->net.report_error;
delete join; delete join;
DBUG_RETURN(error); DBUG_RETURN(error);
} }
else else
DBUG_RETURN(0); DBUG_RETURN(join->error);
} }
/***************************************************************************** /*****************************************************************************