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:
Sergei Golubchik
2023-12-15 20:00:58 +01:00
parent 686865e112 2c60d43d7d
commit e95bba9c58
621 changed files with 28475 additions and 5403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
storage/spider/spd_db_mysql.h
View File

@@ -161,40 +161,22 @@ public:
String *from
) override;
#ifdef SPIDER_HAS_GROUP_BY_HANDLER
int append_table(
ha_spider *spider,
spider_fields *fields,
spider_string *str,
TABLE_LIST *table_list,
TABLE_LIST **used_table_list,
uint *current_pos,
TABLE_LIST **cond_table_list_ptr,
bool top_down,
bool first
);
int append_tables_top_down(
ha_spider *spider,
spider_fields *fields,
spider_string *str,
TABLE_LIST *table_list,
TABLE_LIST **used_table_list,
uint *current_pos,
TABLE_LIST **cond_table_list_ptr
);
int append_tables_top_down_check(
TABLE_LIST *table_list,
TABLE_LIST **used_table_list,
uint *current_pos
);
int append_embedding_tables(
ha_spider *spider,
spider_fields *fields,
spider_string *str,
TABLE_LIST *table_list,
TABLE_LIST **used_table_list,
uint *current_pos,
TABLE_LIST **cond_table_list_ptr
);
int append_table_list(spider_fields *fields,
spider_string *str, TABLE_LIST *table,
table_map *upper_usable_tables,
table_map eliminated_tables);
int append_table_array(spider_fields *fields,
spider_string *str, TABLE_LIST **table,
TABLE_LIST **end, table_map *upper_usable_tables,
table_map eliminated_tables);
int append_join(spider_fields *fields, spider_string *str,
List<TABLE_LIST> *tables, table_map *upper_usable_tables,
table_map eliminated_tables);
int append_from_and_tables(
ha_spider *spider,
spider_fields *fields,
@@ -202,11 +184,6 @@ public:
TABLE_LIST *table_list,
uint table_count
) override;
int reappend_tables(
spider_fields *fields,
SPIDER_LINK_IDX_CHAIN *link_idx_chain,
spider_string *str
) override;
int append_where(
spider_string *str
) override;
@@ -698,8 +675,11 @@ public:
spider_string *show_table_status;
spider_string *show_records;
spider_string *show_index;
/* The remote table names */
spider_string *table_names_str;
/* The remote db names */
spider_string *db_names_str;
/* fixme: this field looks useless */
spider_string *db_table_str;
#ifdef SPIDER_HAS_HASH_VALUE_TYPE
my_hash_value_type *db_table_str_hash_value;
@@ -1625,10 +1605,6 @@ public:
spider_fields *fields,
ulong sql_type
);
int reappend_tables_part(
spider_fields *fields,
ulong sql_type
);
int append_where_part(
ulong sql_type
);