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.6 into 10.10

Browse Source 
The MDEV-29693 conflict resolution is from Monty, as well as is
a bug fix where ANALYZE TABLE wrongly built histograms for
single-column PRIMARY KEY.
Also includes a fix for safe_malloc error reporting.

Other things:
- Copied main.log_slow from 10.4 to avoid mtr issue

Disabled test:
- spider/bugfix.mdev_27239 because we started to get
  +Error	1429 Unable to connect to foreign data source: localhost
  -Error	1158 Got an error reading communication packets
- main.delayed
  - Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED
    This part is disabled for now as it fails randomly with different
    warnings/errors (no corruption).
This commit is contained in:
Marko Mäkelä
2023-10-13 15:14:37 +03:00
committed by Monty
parent 3b38c2f358 8bf17c579b
commit d5e15424d8
436 changed files with 13299 additions and 28179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
storage/spider/spd_db_mysql.cc
View File

@@ -543,11 +543,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);
@@ -572,6 +573,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;
@@ -730,6 +732,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;
@@ -13215,14 +13218,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,
@@ -14364,7 +14359,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);
}