diff options
| author | unknown <monty@narttu.mysql.fi> | 2002-10-14 12:07:16 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2002-10-14 12:07:16 +0300 |
| commit | 6fc7e94616ef775731423db63af7fc506fdddcae (patch) | |
| tree | 26137c7c29554f0b9d1336080b6cdc1044fb6839 /sql/sql_lex.h | |
| parent | 40c2e7499b40a10ee2b8042e5d672b7c4d4c66fe (diff) | |
| parent | a299a27021a7bdd65f93f99f9eb0003f082b305d (diff) | |
| download | mariadb-git-6fc7e94616ef775731423db63af7fc506fdddcae.tar.gz | |
merge
client/mysql.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 16c45c8300e..f301e4c8af0 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -227,6 +227,7 @@ protected: select_result *result; int res; bool describe, found_rows_for_union, + prepared, //prepare phase already performed for UNION (unit) optimized; // optimize phase already performed for UNION (unit) public: /* |