diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-25 07:30:47 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-25 07:30:47 +0300 |
commit | e696e9e63f0ffb9867c24bcfb1aee0e62a233874 (patch) | |
tree | f38e4f16dba46e9185db9fb0ad4332d0404100ee | |
parent | 2b66cd249384221e2a892f655fe84bb58ddc31bd (diff) | |
parent | 9f8871db2f0bcf27b05e6be34c262173b8026c80 (diff) | |
download | mariadb-git-e696e9e63f0ffb9867c24bcfb1aee0e62a233874.tar.gz |
Merge 10.3 into 10.4
-rw-r--r-- | cmake/package_name.cmake | 6 | ||||
-rw-r--r-- | mysql-test/suite/innodb_gis/disabled.def | 2 | ||||
-rw-r--r-- | storage/innobase/page/page0cur.cc | 26 | ||||
-rw-r--r-- | storage/innobase/trx/trx0purge.cc | 5 | ||||
-rw-r--r-- | storage/maria/ma_rt_test.c | 3 | ||||
-rw-r--r-- | storage/myisam/rt_test.c | 3 |
6 files changed, 23 insertions, 22 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index d14bf1f526e..ce13a446fe6 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -110,7 +110,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/page/page0cur.cc b/storage/innobase/page/page0cur.cc index 14a0ab8aa8a..22a3907d298 100644 --- a/storage/innobase/page/page0cur.cc +++ b/storage/innobase/page/page0cur.cc @@ -1299,12 +1299,12 @@ page_cur_insert_rec_low( #ifdef HAVE_valgrind { - const void* rec_start __attribute__((unused)) - = rec - rec_offs_extra_size(offsets); - ulint extra_size __attribute__((unused)) - = rec_offs_extra_size(offsets) - - (rec_offs_comp(offsets) - ? REC_N_NEW_EXTRA_BYTES + const void* rec_start __attribute__((unused)) + = rec - rec_offs_extra_size(offsets); + ulint extra_size __attribute__((unused)) + = rec_offs_extra_size(offsets) + - (rec_offs_comp(offsets) + ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES); /* All data bytes of the record must be valid. */ @@ -1530,13 +1530,13 @@ page_cur_insert_rec_zip( #ifdef HAVE_valgrind { - const void* rec_start __attribute__((unused)) - = rec - rec_offs_extra_size(offsets); - ulint extra_size __attribute__((unused)) - = rec_offs_extra_size(offsets) - - (rec_offs_comp(offsets) - ? REC_N_NEW_EXTRA_BYTES - : REC_N_OLD_EXTRA_BYTES); + const void* rec_start __attribute__((unused)) + = rec - rec_offs_extra_size(offsets); + ulint extra_size __attribute__((unused)) + = rec_offs_extra_size(offsets) + - (rec_offs_comp(offsets) + ? REC_N_NEW_EXTRA_BYTES + : REC_N_OLD_EXTRA_BYTES); /* All data bytes of the record must be valid. */ MEM_CHECK_DEFINED(rec, rec_offs_data_size(offsets)); diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index a71bb6de226..f50d66041b5 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -873,15 +873,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(); mutex_enter(&purge_sys.rseg->mutex); purge_sys.rseg->last_page_no = static_cast<uint32_t>( prev_log_addr.page); purge_sys.rseg->set_last_commit(prev_log_addr.boffset, trx_no); - purge_sys.rseg->needs_purge = log_hdr[TRX_UNDO_NEEDS_PURGE + 1] != 0; + purge_sys.rseg->needs_purge = needs_purge != 0; /* Purge can also produce events, however these are already ordered in the rollback segment and any user generated event will be greater diff --git a/storage/maria/ma_rt_test.c b/storage/maria/ma_rt_test.c index 5af941b78c8..f7e38af3dce 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; @@ -153,7 +152,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*/ @@ -161,7 +159,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 353e20951cd..62c9539eb66 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; @@ -124,14 +123,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 */ |