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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2023-04-27 09:48:27 +03:00
parent c5e50c48bb 902c622215
commit bb1d1dc846
26 changed files with 574 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/spider/spd_db_mysql.h
View File

@@ -448,7 +448,7 @@ public:
bool is_xa_nota_error(
int error_num
);
void fetch_and_print_warnings(struct tm *l_time);
int fetch_and_print_warnings(struct tm *l_time);
spider_db_result *store_result(
spider_db_result_buffer **spider_res_buf,
st_spider_db_request_key *request_key,