diff options
| author | unknown <igor@rurik.mysql.com> | 2005-11-13 17:56:20 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-11-13 17:56:20 -0800 |
| commit | 7d6c818bb8c65e4a96902b125e6e244b46a22468 (patch) | |
| tree | 284461e48d23194798480c65afd64354a9cec3f1 /sql/mysql_priv.h | |
| parent | a8630134c63a70c0c1530c176f41990792e39861 (diff) | |
| parent | 27c59cf307b1050a264d2a40306f0dd034149795 (diff) | |
| download | mariadb-git-7d6c818bb8c65e4a96902b125e6e244b46a22468.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysql_priv.h:
Manual merge
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 1719253a458..15424087a43 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 */ /* Used to identify NESTED_JOIN structures within a join (applicable only to structures that have not been simplified away and embed more the one |