diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-25 08:15:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-25 08:15:20 +0300 |
| commit | ded27d28968e6e47e901b9472001550ec3dbfdd1 (patch) | |
| tree | a8377ff13b5487583ef7880b8ecf2ac337c7030b | |
| parent | 49f95c40656a7333586e3ee11ff981ff41aebd40 (diff) | |
| parent | 1b2acc5b9d784d2cb4cc11e657f1134589c228d4 (diff) | |
| download | mariadb-git-ded27d28968e6e47e901b9472001550ec3dbfdd1.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | cmake/package_name.cmake | 6 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_gis/disabled.def | 2 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0purge.cc | 6 | ||||
| -rw-r--r-- | storage/maria/ma_rt_test.c | 3 | ||||
| -rw-r--r-- | storage/myisam/rt_test.c | 3 |
5 files changed, 11 insertions, 9 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index 21a08401a44..ff7f5ba700f 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -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() diff --git a/mysql-test/suite/innodb_gis/disabled.def b/mysql-test/suite/innodb_gis/disabled.def index 8cae44a3607..bf500c1cb93 100644 --- a/mysql-test/suite/innodb_gis/disabled.def +++ b/mysql-test/suite/innodb_gis/disabled.def @@ -10,3 +10,5 @@ # ############################################################################## +rtree_concurrent_srch : MDEV-15284 COUNT(*) mismatch +rtree_recovery : MDEV-15284 COUNT(*) mismatch diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index 609e058ca52..d78500b1e14 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -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(); diff --git a/storage/maria/ma_rt_test.c b/storage/maria/ma_rt_test.c index 8d9fafc24aa..3af7d93879e 100644 --- a/storage/maria/ma_rt_test.c +++ b/storage/maria/ma_rt_test.c @@ -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 */ diff --git a/storage/myisam/rt_test.c b/storage/myisam/rt_test.c index 11e824a8893..a35d41a0025 100644 --- a/storage/myisam/rt_test.c +++ b/storage/myisam/rt_test.c @@ -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 */ |