database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge 4.1->5.0

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2005-03-31 10:39:48 +03:00
parent 8098ef79f0 7647ac833f
commit 05d4ed14e4
24 changed files with 2028 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_lex.h
View File

@ -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; }