diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-04 07:16:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-04 07:16:38 +0200 |
| commit | 44cf9ee5f7acd2148dc32f4eee4519a087c52b93 (patch) | |
| tree | 5b67e89f11e9cdac90d6cc13655e61a55400addd /sql/table.h | |
| parent | 550d6871a5eb93013435055e11a4fe3009490c82 (diff) | |
| parent | d335b471918b4ab0bca05984a70669653cf3169f (diff) | |
| download | mariadb-git-44cf9ee5f7acd2148dc32f4eee4519a087c52b93.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sql/table.h b/sql/table.h index 7b50caae536..f3f9d5ac036 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1363,12 +1363,6 @@ typedef struct st_schema_table /* Types of derived tables. The ending part is a bitmap of phases that are applicable to a derived table of the type. - * / -#define VIEW_ALGORITHM_UNDEFINED 0 -#define VIEW_ALGORITHM_MERGE 1 + DT_COMMON + DT_MERGE -#define DERIVED_ALGORITHM_MERGE 2 + DT_COMMON + DT_MERGE -#define VIEW_ALGORITHM_TMPTABLE 3 + DT_COMMON + DT_MATERIALIZE -#define DERIVED_ALGORITHM_MATERIALIZE 4 + DT_COMMON + DT_MATERIALIZE */ #define DTYPE_ALGORITHM_UNDEFINED 0 #define DTYPE_VIEW 1 @@ -1401,7 +1395,16 @@ typedef struct st_schema_table #define VIEW_ALGORITHM_UNDEFINED 0 #define VIEW_ALGORITHM_MERGE (DTYPE_VIEW | DTYPE_MERGE) -#define VIEW_ALGORITHM_TMPTABLE (DTYPE_VIEW + DTYPE_MATERIALIZE ) +#define VIEW_ALGORITHM_TMPTABLE (DTYPE_VIEW | DTYPE_MATERIALIZE) + +/* + View algorithm values as stored in the FRM. Values differ from in-memory + representation for backward compatibility. +*/ + +#define VIEW_ALGORITHM_UNDEFINED_FRM 0 +#define VIEW_ALGORITHM_MERGE_FRM 1 +#define VIEW_ALGORITHM_TMPTABLE_FRM 2 #define JOIN_TYPE_LEFT 1 #define JOIN_TYPE_RIGHT 2 |