1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä 2021-08-25 08:15:20 +03:00
commit ded27d2896
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/package_name.cmake
View File

@ -113,7 +113,11 @@ IF(NOT VERSION)
SET(DEFAULT_MACHINE "x86")
ENDIF()
ENDIF()
IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
ENDIF()
IF(NOT PLATFORM)
SET(PLATFORM ${DEFAULT_PLATFORM})
ENDIF()

2
mysql-test/suite/innodb_gis/disabled.def
View File

@ -10,3 +10,5 @@
#
##############################################################################
rtree_concurrent_srch : MDEV-15284 COUNT(*) mismatch
rtree_recovery : MDEV-15284 COUNT(*) mismatch

6
storage/innobase/trx/trx0purge.cc
View File

@ -853,14 +853,16 @@ static void trx_purge_rseg_get_next_history_log(
trx_no = mach_read_from_8(log_hdr + TRX_UNDO_TRX_NO);
ut_ad(mach_read_from_2(log_hdr + TRX_UNDO_NEEDS_PURGE) <= 1);
const byte needs_purge = log_hdr[TRX_UNDO_NEEDS_PURGE + 1];
mtr_commit(&mtr);
mtr.commit();
purge_sys.rseg->latch.wr_lock();
purge_sys.rseg->last_page_no = prev_log_addr.page;
purge_sys.rseg->set_last_commit(prev_log_addr.boffset, trx_no);
if (log_hdr[TRX_UNDO_NEEDS_PURGE + 1]) {
if (needs_purge) {
purge_sys.rseg->set_needs_purge();
} else {
purge_sys.rseg->clear_needs_purge();

3
storage/maria/ma_rt_test.c
View File

@ -133,7 +133,6 @@ static int run_test(const char *filename)
int key_length=8;
int null_fields=0;
int nrecords=sizeof(rt_data)/(sizeof(double)*4);/* 40 */
int rec_length=0;
int uniques=0;
int i, max_i;
int error;
@ -154,7 +153,6 @@ static int run_test(const char *filename)
recinfo[0].type=FIELD_NORMAL;
recinfo[0].length=1; /* For NULL bits */
rec_length=1;
/* Define 2*ndims columns for coordinates*/
@ -162,7 +160,6 @@ static int run_test(const char *filename)
{
recinfo[i].type=FIELD_NORMAL;
recinfo[i].length=key_length;
rec_length+=key_length;
}
/* Define a key with 2*ndims segments */

3
storage/myisam/rt_test.c
View File

@ -104,7 +104,6 @@ static int run_test(const char *filename)
int key_length=8;
int null_fields=0;
int nrecords=sizeof(rt_data)/(sizeof(double)*4);/* 3000;*/
int rec_length=0;
int uniques=0;
int i, max_i;
int error;
@ -125,14 +124,12 @@ static int run_test(const char *filename)
recinfo[0].type=FIELD_NORMAL;
recinfo[0].length=1; /* For NULL bits */
rec_length=1;
/* Define 2*ndims columns for coordinates*/
for (i=1; i<=2*ndims ;i++){
recinfo[i].type=FIELD_NORMAL;
recinfo[i].length=key_length;
rec_length+=key_length;
}
/* Define a key with 2*ndims segments */