diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-03-31 10:39:48 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-03-31 10:39:48 +0300 |
| commit | 8a898a0b72ad14b87608c84f6b775eb586a070a2 (patch) | |
| tree | f46f9a882d5aee1bf10b26d0a45bd5280198b309 /sql/sql_lex.h | |
| parent | 3a44dcd1a3b8b9e23200c3527bb43850ffdb8ece (diff) | |
| parent | 30c85129548f7d8267fab809a723672161c6fce9 (diff) | |
| download | mariadb-git-8a898a0b72ad14b87608c84f6b775eb586a070a2.tar.gz | |
merge 4.1->5.0
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 00e30bd320b..2391c0b7ef9 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -436,7 +436,8 @@ public: void exclude_tree(); /* UNION methods */ - bool prepare(THD *thd, select_result *result, ulong additional_options); + bool prepare(THD *thd, select_result *result, ulong additional_options, + const char *tmp_table_alias); bool exec(); bool cleanup(); inline void unclean() { cleaned= 0; } |