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 branch 'mysql-5.1' into mysql-5.5

Browse Source
This commit is contained in:
Mithun C Y
2015-08-04 12:28:56 +05:30
parent 91a427be93 c28626d0af
commit c20911dbe0
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@ -11953,6 +11953,11 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
join->thd->warning_info->inc_current_row_for_warning(); join->thd->warning_info->inc_current_row_for_warning();
if (rc != NESTED_LOOP_OK && rc != NESTED_LOOP_NO_MORE_ROWS) if (rc != NESTED_LOOP_OK && rc != NESTED_LOOP_NO_MORE_ROWS)
return rc; return rc;
/* check for errors evaluating the condition */
if (join->thd->is_error())
return NESTED_LOOP_ERROR;
if (join->return_tab < join_tab) if (join->return_tab < join_tab)
return NESTED_LOOP_OK; return NESTED_LOOP_OK;
/* /*