summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2017-12-12 20:27:47 +0300
committerAleksey Midenkov <midenok@gmail.com>2017-12-12 20:39:44 +0300
commita0e137c4a9e8a86aeca2b56456f75e1278b7460c (patch)
treea1aa1015764032aae27fa3b0b3686811fc008804 /sql/sql_select.h
parentcb4657e3b42e273318344181754a0cf8fb393524 (diff)
downloadmariadb-git-a0e137c4a9e8a86aeca2b56456f75e1278b7460c.tar.gz
SQL: RIGHT JOIN in derived [fix #383]
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 659bc4e7827..662047c02e3 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -2215,6 +2215,10 @@ inline Item * and_items(THD *thd, Item* cond, Item *item)
{
return (cond ? (new (thd->mem_root) Item_cond_and(thd, cond, item)) : item);
}
+inline Item * or_items(THD *thd, Item* cond, Item *item)
+{
+ return (cond ? (new (thd->mem_root) Item_cond_or(thd, cond, item)) : item);
+}
bool choose_plan(JOIN *join, table_map join_tables);
void optimize_wo_join_buffering(JOIN *join, uint first_tab, uint last_tab,
table_map last_remaining_tables,