mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge branch 'mysql-5.1' into mysql-5.5
This commit is contained in:
@ -11953,6 +11953,11 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
|
||||
join->thd->warning_info->inc_current_row_for_warning();
|
||||
if (rc != NESTED_LOOP_OK && rc != NESTED_LOOP_NO_MORE_ROWS)
|
||||
return rc;
|
||||
|
||||
/* check for errors evaluating the condition */
|
||||
if (join->thd->is_error())
|
||||
return NESTED_LOOP_ERROR;
|
||||
|
||||
if (join->return_tab < join_tab)
|
||||
return NESTED_LOOP_OK;
|
||||
/*
|
||||
|
Reference in New Issue
Block a user