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

MDEV-29644 post-merge fixup

Applying b98375f instead of 9b32e4b for version 10.5-10.8.
Applying 5075f4e instead of 9b32e4b for version 10.9+.
This commit is contained in:
Yuchen Pei
2023-04-27 16:14:05 +10:00
parent 50f3b7d164
commit 6fccf8ba05
3 changed files with 41 additions and 23 deletions

View File

@@ -442,7 +442,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,