database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Yuchen Pei
2024-10-15 16:00:44 +11:00
parent a79c9b3812 77ed235d50
commit cd5577ba4a
233 changed files with 740 additions and 43283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
storage/spider/spd_db_mysql.h
View File

@@ -158,7 +158,6 @@ public:
spider_string *to,
String *from
) override;
#ifdef SPIDER_HAS_GROUP_BY_HANDLER
int append_tables_top_down_check(
TABLE_LIST *table_list,
TABLE_LIST **used_table_list,
@@ -188,7 +187,6 @@ public:
int append_having(
spider_string *str
) override;
#endif
bool tables_on_different_db_are_joinable() override;
bool socket_has_default_value() override;
bool database_has_default_value() override;
@@ -302,7 +300,7 @@ public:
bool has_result() override;
void free_result() override;
SPIDER_DB_ROW *current_row() override;
SPIDER_DB_ROW *fetch_row() override;
SPIDER_DB_ROW *fetch_row(MY_BITMAP *) override;
SPIDER_DB_ROW *fetch_row_from_result_buffer(
spider_db_result_buffer *spider_res_buf
) override;
@@ -1354,13 +1352,11 @@ public:
int reset_sql(
ulong sql_type
) override;
#ifdef SPIDER_HAS_GROUP_BY_HANDLER
int set_sql_for_exec(
ulong sql_type,
int link_idx,
SPIDER_LINK_IDX_CHAIN *link_idx_chain
) override;
#endif
int set_sql_for_exec(
ulong sql_type,
int link_idx
@@ -1479,7 +1475,6 @@ public:
int link_idx,
ulong sql_type
) override;
#ifdef SPIDER_HAS_GROUP_BY_HANDLER
int append_from_and_tables_part(
spider_fields *fields,
ulong sql_type
@@ -1504,7 +1499,8 @@ public:
uint alias_length,
bool use_fields,
spider_fields *fields,
ulong sql_type
ulong sql_type,
int n_aux=0
) override;
int append_list_item_select(
List<Item> *select,
@@ -1512,7 +1508,8 @@ public:
const char *alias,
uint alias_length,
bool use_fields,
spider_fields *fields
spider_fields *fields,
int n_aux
);
int append_group_by_part(
ORDER *order,
@@ -1546,7 +1543,6 @@ public:
bool use_fields,
spider_fields *fields
);
#endif
bool check_direct_update(
st_select_lex *select_lex,
longlong select_limit,