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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-07 08:26:21 +03:00
parent 38dda1f026 c7ba237793
commit 38d36b59f9
19 changed files with 569 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
storage/spider/spd_db_mysql.h
View File

@@ -22,37 +22,33 @@ public:
spider_string *str,
const char *name,
uint name_length
);
) override;
int append_name_with_charset(
spider_string *str,
const char *name,
uint name_length,
CHARSET_INFO *name_charset
);
) override;
int append_escaped_name(
spider_string *str,
const char *name,
uint name_length
);
) override;
int append_escaped_name_with_charset(
spider_string *str,
const char *name,
uint name_length,
CHARSET_INFO *name_charset
);
) override;
bool is_name_quote(
const char head_code
);
) override;
int append_escaped_name_quote(
spider_string *str
);
int append_column_value(
ha_spider *spider,
spider_string *str,
Field *field,
const uchar *new_ptr,
CHARSET_INFO *access_charset
);
) override;
int append_column_value(ha_spider *spider, spider_string *str, Field *field,
const uchar *new_ptr, bool is_like,
CHARSET_INFO *access_charset) override;
int append_from_with_alias(
spider_string *str,
const char **table_names,
@@ -66,19 +62,19 @@ public:
int append_trx_isolation(
spider_string *str,
int trx_isolation
);
) override;
int append_autocommit(
spider_string *str,
bool autocommit
);
) override;
int append_sql_log_off(
spider_string *str,
bool sql_log_off
);
) override;
int append_wait_timeout(
spider_string *str,
int wait_timeout
);
) override;
virtual int append_sql_mode_internal(
spider_string *str,
sql_mode_t sql_mode
@@ -86,25 +82,25 @@ public:
int append_sql_mode(
spider_string *str,
sql_mode_t sql_mode
);
) override;
int append_time_zone(
spider_string *str,
Time_zone *time_zone
);
) override;
int append_loop_check(
spider_string *str,
SPIDER_CONN *conn
);
) override;
int append_start_transaction(
spider_string *str
);
) override;
int append_xa_start(
spider_string *str,
XID *xid
);
) override;
int append_lock_table_head(
spider_string *str
);
) override;
int append_lock_table_body(
spider_string *str,
const char *db_name,
@@ -114,13 +110,13 @@ public:
uint table_name_length,
CHARSET_INFO *table_name_charset,
int lock_type
);
) override;
int append_lock_table_tail(
spider_string *str
);
) override;
int append_unlock_table(
spider_string *str
);
) override;
int open_item_func(
Item_func *item_func,
ha_spider *spider,
@@ -129,7 +125,7 @@ public:
uint alias_length,
bool use_fields,
spider_fields *fields
);
) override;
#ifdef HANDLER_HAS_DIRECT_AGGREGATE
int open_item_sum_func(
Item_sum *item_sum,
@@ -139,12 +135,12 @@ public:
uint alias_length,
bool use_fields,
spider_fields *fields
);
) override;
#endif
int append_escaped_util(
spider_string *to,
String *from
);
) override;
#ifdef SPIDER_HAS_GROUP_BY_HANDLER
int append_table(
ha_spider *spider,
@@ -186,18 +182,18 @@ public:
spider_string *str,
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;
int append_having(
spider_string *str
);
) override;
#endif
bool append_charset_name_before_string();
};
@@ -212,8 +208,9 @@ public:
spider_string *str,
Field *field,
const uchar *new_ptr,
bool is_like,
CHARSET_INFO *access_charset
);
) override;
};
class spider_db_mariadb_util: public spider_db_mbase_util
@@ -224,14 +221,15 @@ public:
int append_sql_mode_internal(
spider_string *str,
sql_mode_t sql_mode
);
) override;
int append_column_value(
ha_spider *spider,
spider_string *str,
Field *field,
const uchar *new_ptr,
bool is_like,
CHARSET_INFO *access_charset
);
) override;
};
class spider_db_mbase_row: public spider_db_row