diff options
| author | Mithun C Y <mithun.c.y@oracle.com> | 2015-08-04 12:28:56 +0530 |
|---|---|---|
| committer | Mithun C Y <mithun.c.y@oracle.com> | 2015-08-04 12:28:56 +0530 |
| commit | c20911dbe05a3a38fafb55035ef440182fbd1815 (patch) | |
| tree | 97c04bba689fdafbb65b6b71e1b3f62b8ec33e98 /sql | |
| parent | 91a427be935c52bf2aac964aa1e1aa84fd324117 (diff) | |
| parent | c28626d0af640dddfb2c4d970f0ce4f6ec1776cc (diff) | |
| download | mariadb-git-c20911dbe05a3a38fafb55035ef440182fbd1815.tar.gz | |
Merge branch 'mysql-5.1' into mysql-5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7b49f378223..eb270812799 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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; /* |