diff options
| author | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
| commit | 10001c8e4f4bf08b3c491dce2714e13cca667890 (patch) | |
| tree | 738ffc405ffa9a11753f7b9a781f244dc270f803 /sql/table.h | |
| parent | f68eac2eadb9bdb3d9c3554b37d6c253f04562d2 (diff) | |
| parent | 5426facdcbfba2d78dab3c709cbf278073383b7c (diff) | |
| download | mariadb-git-10001c8e4f4bf08b3c491dce2714e13cca667890.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/table.h b/sql/table.h index 6d8be8f948a..260ff7cf6ba 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1065,7 +1065,6 @@ public: ORDER *group; String alias; /* alias or table name */ uchar *null_flags; - my_bitmap_map *bitmap_init_value; MY_BITMAP def_read_set, def_write_set, def_vcol_set, tmp_set; MY_BITMAP eq_join_set; /* used to mark equi-joined fields */ MY_BITMAP cond_set; /* used to mark fields from sargable conditions*/ @@ -1950,7 +1949,7 @@ struct TABLE_LIST Indicates that if TABLE_LIST object corresponds to the table/view which requires special handling. */ - enum + enum enum_open_strategy { /* Normal open. */ OPEN_NORMAL= 0, |