diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
| commit | dfb74dea300f83880c11600dc726a9cae559f356 (patch) | |
| tree | 76da0d6e23f188bc13520bf80496e9053f227d9a /sql/sql_select.cc | |
| parent | b785857d00a0fd9c98cb52823357bfad8fb18289 (diff) | |
| parent | e7cb032e560e14865941ecdcb553cd3aba856b68 (diff) | |
| download | mariadb-git-dfb74dea300f83880c11600dc726a9cae559f356.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_select.cc')
| -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 fff0dc162c6..1949163c87a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -15997,6 +15997,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, case Item::FIELD_ITEM: case Item::DEFAULT_VALUE_ITEM: case Item::INSERT_VALUE_ITEM: + case Item::TRIGGER_FIELD_ITEM: { Item_field *field= (Item_field*) item; bool orig_modify= modify_item; @@ -18501,6 +18502,10 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab, if (return_tab < join->return_tab) join->return_tab= return_tab; + /* check for errors evaluating the condition */ + if (join->thd->is_error()) + DBUG_RETURN(NESTED_LOOP_ERROR); + if (join->return_tab < join_tab) DBUG_RETURN(NESTED_LOOP_OK); /* |