diff options
author | unknown <sanja@askmonty.org> | 2013-09-25 21:07:06 +0300 |
---|---|---|
committer | unknown <sanja@askmonty.org> | 2013-09-25 21:07:06 +0300 |
commit | 9d83468e78ba23f024ce3c11443913ad75cf1ea5 (patch) | |
tree | 0cef7fa6a3fd2e47fe22d105b2b8bbfe1b5a03e0 /sql/table.h | |
parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
parent | 64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (diff) | |
download | mariadb-git-9d83468e78ba23f024ce3c11443913ad75cf1ea5.tar.gz |
merge 5.5 -> 10.0-base
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index ffbe88602f9..1e29ca9d095 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1555,6 +1555,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 |