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 remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-05-17 12:59:07 +04:00
parent 6378c95ee0 fba7fbbc5c
commit 896c2c73a0
120 changed files with 4188 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_lex.h
View File

@ -640,6 +640,14 @@ protected:
ulonglong found_rows_for_union;
bool saved_error;
bool prepare_join(THD *thd, SELECT_LEX *sl, select_result *result,
ulong additional_options,
bool is_union_select);
bool join_union_item_types(THD *thd, List<Item> &types, uint count);
bool join_union_type_handlers(THD *thd,
class Type_holder *holders, uint count);
bool join_union_type_attributes(THD *thd,
class Type_holder *holders, uint count);
public:
// Ensures that at least all members used during cleanup() are initialized.
st_select_lex_unit()
@ -749,9 +757,6 @@ public:
/* UNION methods */
bool prepare(THD *thd, select_result *result, ulong additional_options);
bool prepare_join(THD *thd, SELECT_LEX *sl, select_result *result,
ulong additional_options,
bool is_union_select);
bool optimize();
bool exec();
bool exec_recursive();
@ -3275,6 +3280,12 @@ public:
Item *create_item_func_lastval(THD *thd, const LEX_CSTRING *db,
const LEX_CSTRING *name);
/*
Create an item for "SETVAL(sequence_name, value [, is_used [, round]])
*/
Item *create_item_func_setval(THD *thd, Table_ident *ident, longlong value,
ulonglong round, bool is_used);
/*
Create an item for a name in LIMIT clause: LIMIT var
@param THD - THD, for mem_root