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 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2023-10-19 08:26:16 +03:00
parent 05d850d4b3 be24e75229
commit 9b2a65e41a
503 changed files with 15041 additions and 28952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
storage/spider/spd_db_mysql.cc
View File

@@ -544,11 +544,12 @@ SPIDER_DB_ROW *spider_db_mbase_row::clone()
} else {
row_size = record_size + field_count;
}
if (!spider_bulk_malloc(spider_current_trx, 29, MYF(MY_WME),
&clone_row->row, (uint) (sizeof(char*) * field_count),
&tmp_char, (uint) (row_size),
&clone_row->lengths, (uint) (sizeof(ulong) * field_count),
NullS)
if (!spider_bulk_malloc(
spider_current_trx, 29, MYF(MY_WME),
&clone_row->row, (uint) (sizeof(char*) * (field_count + 1)),
&tmp_char, (uint) (row_size),
&clone_row->lengths, (uint) (sizeof(ulong) * field_count),
NullS)
) {
delete clone_row;
DBUG_RETURN(NULL);
@@ -573,6 +574,7 @@ SPIDER_DB_ROW *spider_db_mbase_row::clone()
tmp_lengths++;
tmp_row++;
}
clone_row->row[field_count] = NULL;
clone_row->field_count = field_count;
clone_row->record_size = record_size;
clone_row->row_first = clone_row->row;
@@ -731,6 +733,7 @@ SPIDER_DB_ROW *spider_db_mbase_result::fetch_row()
}
row.lengths = mysql_fetch_lengths(db_result);
row.field_count = mysql_num_fields(db_result);
row.row[row.field_count] = NULL;
row.row_first = row.row;
row.lengths_first = row.lengths;
row.record_size = 0;
@@ -13085,14 +13088,6 @@ int spider_mbase_handler::reset_sql(
DBUG_RETURN(0);
}
bool spider_mbase_handler::need_lock_before_set_sql_for_exec(
ulong sql_type
) {
DBUG_ENTER("spider_mbase_handler::need_lock_before_set_sql_for_exec");
DBUG_PRINT("info",("spider this=%p", this));
DBUG_RETURN(FALSE);
}
int spider_mbase_handler::set_sql_for_exec(
ulong sql_type,
int link_idx,
@@ -13917,7 +13912,6 @@ int spider_mbase_handler::show_records(
DBUG_PRINT("info", ("spider error_num=%d", error_num));
DBUG_RETURN(error_num);
}
spider->wide_handler->trx->direct_aggregate_count++;
DBUG_RETURN(0);
}