diff options
| author | unknown <igor@rurik.mysql.com> | 2005-10-17 15:02:06 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-10-17 15:02:06 -0700 |
| commit | 8a84dd7e7f9d699c84d2ed52fe6189f01e6d0ce6 (patch) | |
| tree | 4f84fc8ed8f568811c03e679c58281675bb38bc6 /sql/mysql_priv.h | |
| parent | 0122ca60b8c07b9493fa453eb5e12a52234dd579 (diff) | |
| parent | 3e0d1a4882aca1bb7cbd3aced3fb718d5a521110 (diff) | |
| download | mariadb-git-8a84dd7e7f9d699c84d2ed52fe6189f01e6d0ce6.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 27eb6556d66..19fa0000974 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -44,6 +44,7 @@ typedef ulonglong table_map; /* Used for table bits in join */ typedef Bitmap<64> key_map; /* Used for finding keys */ typedef ulong key_part_map; /* Used for finding key parts */ +typedef ulong nesting_map; /* Used for flags of nesting constructs */ /* query_id */ typedef ulonglong query_id_t; |