summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2013-09-25 17:16:13 +0300
committerunknown <sanja@askmonty.org>2013-09-25 17:16:13 +0300
commit64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (patch)
treec313ec7d9f9db0c90649df5297e2d39230986291 /sql/table.h
parent72dffd878e47e4fcfd224cadfea06caed0ac956b (diff)
parentec7da1561e028aac40dee69433113978c982ce84 (diff)
downloadmariadb-git-64d6d8334fa63a0faa6d91ded21eca8e3871c7ec.tar.gz
merge 5.3 -> 5.5
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h
index c7a032e3811..16d19271a1f 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1458,6 +1458,7 @@ typedef struct st_schema_table
#define JOIN_TYPE_LEFT 1
#define JOIN_TYPE_RIGHT 2
+#define JOIN_TYPE_OUTER 4 /* Marker that this is an outer join */
#define VIEW_SUID_INVOKER 0
#define VIEW_SUID_DEFINER 1