database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-03-26 22:25:38 +01:00
parent a91c59c2af 44002a34e6
commit 10740939eb
600 changed files with 129062 additions and 121039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/table.h
View File

@@ -2170,9 +2170,11 @@ struct TABLE_LIST
}
inline void set_merged_derived()
{
DBUG_ENTER("set_merged_derived");
derived_type= ((derived_type & DTYPE_MASK) |
DTYPE_TABLE | DTYPE_MERGE);
set_check_merged();
DBUG_VOID_RETURN;
}
inline bool is_materialized_derived()
{
@@ -2180,9 +2182,11 @@ struct TABLE_LIST
}
void set_materialized_derived()
{
DBUG_ENTER("set_materialized_derived");
derived_type= ((derived_type & DTYPE_MASK) |
DTYPE_TABLE | DTYPE_MATERIALIZE);
set_check_materialized();
DBUG_VOID_RETURN;
}
inline bool is_multitable()
{