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.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-29 15:24:38 +01:00
parent db3be9b434 f00711bba2
commit 3d0fb15028
655 changed files with 8060 additions and 3541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/spider/spd_db_mysql.h
View File

@@ -300,7 +300,7 @@ public:
bool has_result() override;
void free_result() override;
SPIDER_DB_ROW *current_row() override;
SPIDER_DB_ROW *fetch_row() override;
SPIDER_DB_ROW *fetch_row(MY_BITMAP *) override;
SPIDER_DB_ROW *fetch_row_from_result_buffer(
spider_db_result_buffer *spider_res_buf
) override;
@@ -1460,7 +1460,8 @@ public:
uint alias_length,
bool use_fields,
spider_fields *fields,
ulong sql_type
ulong sql_type,
int n_aux=0
) override;
int append_list_item_select(
List<Item> *select,
@@ -1468,7 +1469,8 @@ public:
const char *alias,
uint alias_length,
bool use_fields,
spider_fields *fields
spider_fields *fields,
int n_aux
);
int append_group_by_part(
ORDER *order,