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-05-31 09:10:17 +10:00
parent 5ba542e9ee 25476ba1ae
commit f2302a62e3
46 changed files with 160 additions and 15891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
storage/spider/spd_db_mysql.h
View File

@@ -566,54 +566,6 @@ public:
uint binlog_pos_length,
SPIDER_DB_RESULT **res
);
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
int append_sql(
char *sql,
ulong sql_length,
st_spider_db_request_key *request_key
);
int append_open_handler(
uint handler_id,
const char *db_name,
const char *table_name,
const char *index_name,
const char *sql,
st_spider_db_request_key *request_key
);
int append_select(
uint handler_id,
spider_string *sql,
SPIDER_DB_HS_STRING_REF_BUFFER *keys,
int limit,
int skip,
st_spider_db_request_key *request_key
);
int append_insert(
uint handler_id,
SPIDER_DB_HS_STRING_REF_BUFFER *upds,
st_spider_db_request_key *request_key
);
int append_update(
uint handler_id,
spider_string *sql,
SPIDER_DB_HS_STRING_REF_BUFFER *keys,
SPIDER_DB_HS_STRING_REF_BUFFER *upds,
int limit,
int skip,
bool increment,
bool decrement,
st_spider_db_request_key *request_key
);
int append_delete(
uint handler_id,
spider_string *sql,
SPIDER_DB_HS_STRING_REF_BUFFER *keys,
int limit,
int skip,
st_spider_db_request_key *request_key
);
void reset_request_queue();
#endif
size_t escape_string(
char *to,
const char *from,
@@ -804,9 +756,6 @@ protected:
spider_string *exec_ha_sql;
bool reading_from_bulk_tmp_table;
bool filled_up;
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
SPIDER_DB_HS_STRING_REF_BUFFER hs_upds;
#endif
SPIDER_INT_HLD *union_table_name_pos_first;
SPIDER_INT_HLD *union_table_name_pos_current;
public:
@@ -913,14 +862,6 @@ public:
int append_delete(
spider_string *str
);
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
#ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS
int append_increment_update_set_part();
int append_increment_update_set(
spider_string *str
);
#endif
#endif
int append_update_set_part();
int append_update_set(
spider_string *str
@@ -1313,64 +1254,40 @@ public:
ulong sql_type,
int link_idx
);
int append_flush_tables_part(
ulong sql_type,
int link_idx,
bool lock
);
int append_flush_tables_part(int link_idx, bool lock);
int append_flush_tables(
spider_string *str,
int link_idx,
bool lock
);
int append_optimize_table_part(
ulong sql_type,
int link_idx
);
int append_optimize_table_part(int link_idx);
int append_optimize_table(
spider_string *str,
int link_idx
);
int append_analyze_table_part(
ulong sql_type,
int link_idx
);
int append_analyze_table_part(int link_idx);
int append_analyze_table(
spider_string *str,
int link_idx
);
int append_repair_table_part(
ulong sql_type,
int link_idx,
HA_CHECK_OPT* check_opt
);
int append_repair_table_part(int link_idx, HA_CHECK_OPT *check_opt);
int append_repair_table(
spider_string *str,
int link_idx,
HA_CHECK_OPT* check_opt
);
int append_check_table_part(
ulong sql_type,
int link_idx,
HA_CHECK_OPT* check_opt
);
int append_check_table_part(int link_idx, HA_CHECK_OPT *check_opt);
int append_check_table(
spider_string *str,
int link_idx,
HA_CHECK_OPT* check_opt
);
int append_enable_keys_part(
ulong sql_type,
int link_idx
);
int append_enable_keys_part(int link_idx);
int append_enable_keys(
spider_string *str,
int link_idx
);
int append_disable_keys_part(
ulong sql_type,
int link_idx
);
int append_disable_keys_part(int link_idx);
int append_disable_keys(
spider_string *str,
int link_idx
@@ -1451,23 +1368,6 @@ public:
int reset_sql(
ulong sql_type
);
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
int reset_keys(
ulong sql_type
);
int reset_upds(
ulong sql_type
);
int reset_strs(
ulong sql_type
);
int reset_strs_pos(
ulong sql_type
);
int push_back_upds(
SPIDER_HS_STRING_REF &info
);
#endif
#ifdef SPIDER_HAS_GROUP_BY_HANDLER
int set_sql_for_exec(
ulong sql_type,