- commits - lists.mariadb.org

[Commits] 2f7634aa98f: Update rocksdb.test with new default for rocksdb_max_lock_memory
by Sergei Petrunia 30 Nov '18

30 Nov '18

revision-id: 2f7634aa98f2413a383db8fd5a848571a134eb13 (fb-prod201801-171-g2f7634aa98f) parent(s): ed5c828882cf85ffa53e33c350d9cebb10f72a4b author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-11-30 14:14:00 +0300 message: Update rocksdb.test with new default for rocksdb_max_lock_memory Also update to latest rocksdb branch with range locking --- mysql-test/suite/rocksdb/r/rocksdb.result | 2 +- rocksdb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rocksdb/r/rocksdb.result b/mysql-test/suite/rocksdb/r/rocksdb.result index 28620d09368..9b6f553df06 100644 --- a/mysql-test/suite/rocksdb/r/rocksdb.result +++ b/mysql-test/suite/rocksdb/r/rocksdb.result @@ -931,7 +931,7 @@ rocksdb_manual_wal_flush ON rocksdb_master_skip_tx_api OFF rocksdb_max_background_jobs 2 rocksdb_max_latest_deadlocks 5 -rocksdb_max_lock_memory 16777216 +rocksdb_max_lock_memory 1073741824 rocksdb_max_log_file_size 0 rocksdb_max_manifest_file_size 1073741824 rocksdb_max_manual_compactions 10 diff --git a/rocksdb b/rocksdb index 0ba14a1efa8..0320154e8fa 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 0ba14a1efa8f4cfccedc85c7efa317be35c60333 +Subproject commit 0320154e8fa4a3a24f1a65fec2487e490dfb8507

1 0

[Commits] 4d681a1a64b: Range locking: make more tests pass
by Sergei Petrunia 29 Nov '18

29 Nov '18

revision-id: 4d681a1a64bbd5f2528f4c396777911c4ba9e2b8 (fb-prod201801-169-g4d681a1a64b) parent(s): 9447f482b2d086ee644f02caba9ce0d225bdd514 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-11-29 22:50:47 +0300 message: Range locking: make more tests pass - Increase the default memory size for rocksdb_max_lock_memory (see MDEV-17874 for reasoning) - Update rocksdb to latest fixes --- rocksdb | 2 +- storage/rocksdb/ha_rocksdb.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rocksdb b/rocksdb index 0320154e8fa..0ba14a1efa8 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 0320154e8fa4a3a24f1a65fec2487e490dfb8507 +Subproject commit 0ba14a1efa8f4cfccedc85c7efa317be35c60333 diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index da75885cd36..d5d8ead4883 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -1718,7 +1718,7 @@ static MYSQL_SYSVAR_ULONG( max_lock_memory, rocksdb_max_lock_memory, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Max Lock Memory when using Range Locking (like in TokuDB)", - nullptr, nullptr, 16*1024*1024 /* default value */, 1024 /* min value */, + nullptr, nullptr, 1024*1024*1024 /* default value */, 1024 /* min value */, ULONG_MAX /* max value */, 0); static const int ROCKSDB_ASSUMED_KEY_VALUE_DISK_SIZE = 100;

1 0

[Commits] 0ba14a1ef: Range Locking: return proper error code from RangeLockMgr::TryRangeLock
by Sergei Petrunia 29 Nov '18

29 Nov '18

revision-id: 0ba14a1efa8f4cfccedc85c7efa317be35c60333 (v5.8-1018-g0ba14a1ef) parent(s): 0320154e8fa4a3a24f1a65fec2487e490dfb8507 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-11-29 22:48:52 +0300 message: Range Locking: return proper error code from RangeLockMgr::TryRangeLock --- utilities/transactions/transaction_lock_mgr.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index ae317742e..db856f725 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -350,10 +350,18 @@ Status RangeLockMgr::TryRangeLock(PessimisticTransaction* txn, nullptr, /* killed_callback */ nullptr /* lock_wait_needed_callback*/ ); request.destroy(); - if (r != 0) - return Status::TimedOut(Status::SubCode::kLockTimeout); - - return Status::OK(); + switch (r) { + case 0: + return Status::OK(); + case DB_LOCK_NOTGRANTED: + return Status::TimedOut(Status::SubCode::kLockTimeout); + case TOKUDB_OUT_OF_LOCKS: + debug_dump_locks(this); + return Status::Busy(Status::SubCode::kLockLimit); + default: + assert(0); + return Status::Busy(Status::SubCode::kLockLimit); + } }

1 0

[Commits] 79f9820f030: Revert unnecessary change on ha_prototypes.h
by jan 29 Nov '18

29 Nov '18

revision-id: 79f9820f0309b141e27d0841298d63349743b744 (mariadb-10.3.6-216-g79f9820f030) parent(s): 067c444615c1e82a8d06fad0a528b97426436b87 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-29 14:56:46 +0200 message: Revert unnecessary change on ha_prototypes.h --- storage/innobase/include/ha_prototypes.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h index 5fc1d3cc90e..15107a93807 100644 --- a/storage/innobase/include/ha_prototypes.h +++ b/storage/innobase/include/ha_prototypes.h @@ -236,11 +236,13 @@ innobase_casedn_str( #ifdef WITH_WSREP UNIV_INTERN int -wsrep_innobase_kill_one_trx(void *thd_ptr, - const trx_t *bf_trx, trx_t *victim_trx, ibool signal); +wsrep_innobase_kill_one_trx(void * const thd_ptr, + const trx_t * const bf_trx, + trx_t *victim_trx, + ibool signal); ulint wsrep_innobase_mysql_sort(int mysql_type, uint charset_number, - unsigned char* str, unsigned int str_length, - unsigned int buf_length); + unsigned char* str, unsigned int str_length, + unsigned int buf_length); #endif /* WITH_WSREP */ /**********************************************************************//**

1 0

[Commits] 067c444615c: Reduce diff on row0ins.cc
by jan 29 Nov '18

29 Nov '18

revision-id: 067c444615c1e82a8d06fad0a528b97426436b87 (mariadb-10.3.6-215-g067c444615c) parent(s): 87a9ca2681fda2ed9f35dd78a0c6f66fe637eea1 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-29 14:15:35 +0200 message: Reduce diff on row0ins.cc --- storage/innobase/row/row0ins.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 340d158222e..129ace42cf2 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -44,10 +44,7 @@ Created 4/20/1996 Heikki Tuuri #include "buf0lru.h" #include "fts0fts.h" #include "fts0types.h" -#include "wsrep_api.h" -#include "mysql/service_wsrep.h" #include "wsrep_mysqld.h" -#include "mysql/service_wsrep.h" /************************************************************************* IMPORTANT NOTE: Any operation that generates redo MUST check that there @@ -1809,19 +1806,13 @@ row_ins_check_foreign_constraint( if (check_ref) { err = DB_SUCCESS; #ifdef WITH_WSREP - wsrep_key_type key_type; - if (upd_node != NULL) { - key_type = WSREP_KEY_SHARED; - } else { - key_type = WSREP_KEY_SEMI; - } err = wsrep_append_foreign_key( thr_get_trx(thr), foreign, rec, check_index, check_ref, - key_type); + upd_node != NULL ? WSREP_KEY_SHARED : WSREP_KEY_SEMI); #endif /* WITH_WSREP */ goto end_scan; } else if (foreign->type != 0) {

1 0

[Commits] 87a9ca2681f: Reduce unnecessary diff on lock0lock.cc file.
by jan 29 Nov '18

29 Nov '18

revision-id: 87a9ca2681fda2ed9f35dd78a0c6f66fe637eea1 (mariadb-10.3.6-214-g87a9ca2681f) parent(s): 3470856ed1176730e1922470d2657a5aa9431ef8 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-29 12:41:50 +0200 message: Reduce unnecessary diff on lock0lock.cc file. --- storage/innobase/lock/lock0lock.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 6363bd8e310..cfe6f22ef08 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -1425,8 +1425,8 @@ lock_rec_create_low( lock_t *hash = (lock_t *)c_lock->hash; lock_t *prev = NULL; - while (hash && wsrep_thd_is_BF(((lock_t *)hash)->trx->mysql_thd, TRUE) - && wsrep_thd_order_before(((lock_t *)hash)->trx->mysql_thd, + while (hash && wsrep_thd_is_BF(hash->trx->mysql_thd, TRUE) + && wsrep_thd_order_before(hash->trx->mysql_thd, trx->mysql_thd)) { prev = hash; hash = (lock_t *)hash->hash;

1 0

[Commits] 3470856ed11: Remove unnecessary WITH_WSREP_OUT
by jan 29 Nov '18

29 Nov '18

revision-id: 3470856ed1176730e1922470d2657a5aa9431ef8 (mariadb-10.3.6-213-g3470856ed11) parent(s): 85e80059a2669a4e4ec9554c990380594d94769f author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-29 12:26:04 +0200 message: Remove unnecessary WITH_WSREP_OUT --- storage/innobase/buf/buf0dump.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc index 34462873b57..e3aca33f828 100644 --- a/storage/innobase/buf/buf0dump.cc +++ b/storage/innobase/buf/buf0dump.cc @@ -43,9 +43,6 @@ Created April 08, 2011 Vasil Dimov #include "ut0byte.h" #include <algorithm> -#ifdef WITH_WSREP_OUT -extern my_bool wsrep_recovery; -#endif /* WITH_WSREP */ #include "mysql/service_wsrep.h" /* wsrep_recovery */ #include <my_service_manager.h>

1 0

[Commits] d0aa55c85d1: Reduce unnecessary diff caused by Galera 4 merge.
by jan 29 Nov '18

29 Nov '18

revision-id: d0aa55c85d119d2107c80636ccae0217fe0b1bae (mariadb-10.3.6-209-gd0aa55c85d1) parent(s): 8465b21f1eb7df4ed4b2c73d7ac8e0e72b829818 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-29 08:49:13 +0200 message: Reduce unnecessary diff caused by Galera 4 merge. Phase 1. --- extra/mariabackup/wsrep.cc | 2 +- storage/innobase/handler/ha_innodb.cc | 76 ++++++++++++++--------------------- storage/innobase/lock/lock0lock.cc | 8 ++-- storage/innobase/lock/lock0wait.cc | 8 ++-- storage/innobase/row/row0upd.cc | 16 +++----- storage/innobase/srv/srv0conc.cc | 2 +- storage/innobase/srv/srv0srv.cc | 2 - storage/innobase/trx/trx0roll.cc | 2 +- 8 files changed, 45 insertions(+), 71 deletions(-) diff --git a/extra/mariabackup/wsrep.cc b/extra/mariabackup/wsrep.cc index 099d3c4f216..c3ad1b53a21 100644 --- a/extra/mariabackup/wsrep.cc +++ b/extra/mariabackup/wsrep.cc @@ -83,7 +83,7 @@ xb_write_galera_info(bool incremental_prepare) } wsrep_uuid_t uuid; - memcpy(&uuid, wsrep_xid_uuid(&xid), sizeof(uuid)); + memcpy(uuid.data, wsrep_xid_uuid(&xid), sizeof(uuid.data)); if (wsrep_uuid_print(&uuid, uuid_str, sizeof(uuid_str)) < 0) { return; diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 1878df48427..82892cbe206 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -4168,10 +4168,10 @@ static int innodb_init(void* p) | HTON_NATIVE_SYS_VERSIONING; #ifdef WITH_WSREP - innobase_hton->abort_transaction=wsrep_abort_transaction; - innobase_hton->set_checkpoint=innobase_wsrep_set_checkpoint; - innobase_hton->get_checkpoint=innobase_wsrep_get_checkpoint; - innobase_hton->fake_trx_id=NULL; + innobase_hton->abort_transaction=wsrep_abort_transaction; + innobase_hton->set_checkpoint=innobase_wsrep_set_checkpoint; + innobase_hton->get_checkpoint=innobase_wsrep_get_checkpoint; + innobase_hton->fake_trx_id=NULL; #endif /* WITH_WSREP */ innobase_hton->tablefile_extensions = ha_innobase_exts; @@ -4638,16 +4638,6 @@ innobase_commit( this one, to allow then to group commit with us. */ thd_wakeup_subsequent_commits(thd, 0); -#ifdef WITH_WSREP - /* Serialisation history has been written, so the - commit is now ordered. - This seems to be problematic with load data splitting. - Commented out for now. */ - // if (trx->mysql_thd) { - // (void)wsrep_ordered_commit_if_no_binlog(trx->mysql_thd); - // } -#endif /* WITH_WSREP */ - /* Now do a write + flush of logs. */ trx_commit_complete_for_mysql(trx); @@ -5140,20 +5130,20 @@ static void innobase_kill_query(handlerton*, THD* thd, enum thd_kill_levels) if (trx_t* trx = thd_to_trx(thd)) { #ifdef WITH_WSREP - bool locked= trx->lock.was_chosen_as_deadlock_victim; - if (locked) { - lock_mutex_exit(); - trx_mutex_exit(trx); - } + bool locked= trx->lock.was_chosen_as_deadlock_victim; + if (locked) { + lock_mutex_exit(); + trx_mutex_exit(trx); + } #endif /* WITH_WSREP */ ut_ad(trx->mysql_thd == thd); /* Cancel a pending lock request if there are any */ lock_trx_handle_wait(trx); #ifdef WITH_WSREP - if (locked) { - lock_mutex_enter(); - trx_mutex_enter(trx); - } + if (locked) { + lock_mutex_enter(); + trx_mutex_enter(trx); + } #endif /* WITH_WSREP */ } @@ -6973,8 +6963,7 @@ wsrep_store_key_val_for_row( { KEY* key_info = table->key_info + keynr; KEY_PART_INFO* key_part = key_info->key_part; - KEY_PART_INFO* end = - key_part + key_info->user_defined_key_parts; + KEY_PART_INFO* end = key_part + key_info->user_defined_key_parts; char* buff_start = buff; enum_field_types mysql_type; Field* field; @@ -8204,11 +8193,13 @@ ha_innobase::write_row( error, m_prebuilt->table->flags, m_user_thd); #ifdef WITH_WSREP - if (!error_result && wsrep_thd_is_local(m_user_thd) && - wsrep_on(m_user_thd) && !wsrep_consistency_check(m_user_thd) && - (thd_sql_command(m_user_thd) != SQLCOM_CREATE_TABLE) && - (thd_sql_command(m_user_thd) != SQLCOM_LOAD || - thd_binlog_format(m_user_thd) == BINLOG_FORMAT_ROW)) { + if (!error_result + && wsrep_on(m_user_thd) + && wsrep_thd_is_local(m_user_thd) + && !wsrep_consistency_check(m_user_thd) + && (thd_sql_command(m_user_thd) != SQLCOM_CREATE_TABLE) + && (thd_sql_command(m_user_thd) != SQLCOM_LOAD || + thd_binlog_format(m_user_thd) == BINLOG_FORMAT_ROW)) { if (wsrep_append_keys(m_user_thd, WSREP_KEY_EXCLUSIVE, record, NULL)) { DBUG_PRINT("wsrep", ("row key failed")); @@ -8905,8 +8896,9 @@ ha_innobase::update_row( innobase_active_small(); #ifdef WITH_WSREP - if (error == DB_SUCCESS && wsrep_thd_is_local(m_user_thd) && - wsrep_on(m_user_thd)) { + if (error == DB_SUCCESS + && wsrep_on(m_user_thd) + && wsrep_thd_is_local(m_user_thd)) { DBUG_PRINT("wsrep", ("update row key")); @@ -8971,9 +8963,10 @@ ha_innobase::delete_row( innobase_active_small(); #ifdef WITH_WSREP - if (error == DB_SUCCESS && wsrep_thd_is_local(m_user_thd) && - wsrep_on(m_user_thd) && - !wsrep_thd_ignore_table(m_user_thd)) { + if (error == DB_SUCCESS + && wsrep_on(m_user_thd) + && wsrep_thd_is_local(m_user_thd) + && !wsrep_thd_ignore_table(m_user_thd)) { if (wsrep_append_keys(m_user_thd, WSREP_KEY_EXCLUSIVE, record, NULL)) { @@ -10525,8 +10518,8 @@ ha_innobase::wsrep_append_keys( if (rcode) DBUG_RETURN(rcode); - if (key_info->flags & HA_NOSAME || - key_type == WSREP_KEY_SHARED) + if (key_info->flags & HA_NOSAME + || key_type == WSREP_KEY_SHARED) key_appended = true; } else { WSREP_DEBUG("NULL key skipped: %s", @@ -18656,15 +18649,6 @@ innobase_wsrep_get_checkpoint( trx_rseg_read_wsrep_checkpoint(*xid); return 0; } -#if UNUSED /* 2b27ac8282ed (Marko Mäkelä 2018-05-01) */ -static void wsrep_fake_trx_id(handlerton *, THD *thd) -{ - trx_id_t trx_id = trx_sys.get_new_trx_id(); - WSREP_DEBUG("innodb fake trx id: " TRX_ID_FMT " thd: %s", - trx_id, wsrep_thd_query(thd)); - wsrep_ws_handle_for_trx(wsrep_thd_ws_handle(thd), trx_id); -} -#endif /* UNUSED */ #endif /* WITH_WSREP */ /* plugin options */ diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index b465ec30592..6363bd8e310 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -1425,11 +1425,9 @@ lock_rec_create_low( lock_t *hash = (lock_t *)c_lock->hash; lock_t *prev = NULL; - while (hash && - wsrep_thd_is_BF(((lock_t *)hash)->trx->mysql_thd, TRUE) && - wsrep_thd_order_before( - ((lock_t *)hash)->trx->mysql_thd, - trx->mysql_thd)) { + while (hash && wsrep_thd_is_BF(((lock_t *)hash)->trx->mysql_thd, TRUE) + && wsrep_thd_order_before(((lock_t *)hash)->trx->mysql_thd, + trx->mysql_thd)) { prev = hash; hash = (lock_t *)hash->hash; } diff --git a/storage/innobase/lock/lock0wait.cc b/storage/innobase/lock/lock0wait.cc index fb2b4e688f5..e86410965f7 100644 --- a/storage/innobase/lock/lock0wait.cc +++ b/storage/innobase/lock/lock0wait.cc @@ -197,8 +197,8 @@ wsrep_is_BF_lock_timeout( if (wsrep_on_trx(trx) && wsrep_thd_is_BF(trx->mysql_thd, FALSE) && trx->error_state != DB_DEADLOCK) { - ib::info() << "WSREP: BF lock wait long for trx:" << ib::hex(trx->id) - << " query: " << wsrep_thd_query(trx->mysql_thd); + ib::info() << "WSREP: BF lock wait long for trx:" << ib::hex(trx->id) + << " query: " << wsrep_thd_query(trx->mysql_thd); if (!locked) { lock_mutex_enter(); } @@ -216,9 +216,7 @@ wsrep_is_BF_lock_timeout( os_event_set(srv_monitor_event); return true; } - - - return false; + return false; } #endif /* WITH_WSREP */ diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc index 67006295067..be27348683a 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -2448,11 +2448,9 @@ row_upd_sec_index_entry( } #ifdef WITH_WSREP if (!referenced && foreign - && wsrep_on(trx->mysql_thd) - && !wsrep_thd_is_BF(trx->mysql_thd, FALSE) - && (!parent || que_node_get_type(parent) != QUE_NODE_UPDATE || - !parent->cascade_node) - ) { + && wsrep_must_process_fk(node, trx) + && !wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { + ulint* offsets = rec_get_offsets( rec, index, NULL, true, @@ -2772,9 +2770,8 @@ row_upd_clust_rec_by_insert( if (err != DB_SUCCESS) { goto err_exit; } - } #ifdef WITH_WSREP - else if (foreign && wsrep_must_process_fk(node, trx)) { + } else if (foreign && wsrep_must_process_fk(node, trx)) { err = wsrep_row_upd_check_foreign_constraints( node, pcur, table, index, offsets, thr, mtr); @@ -2796,8 +2793,8 @@ row_upd_clust_rec_by_insert( << " table " << index->table->name; goto err_exit; } - } #endif /* WITH_WSREP */ + } } mtr_commit(mtr); @@ -3003,8 +3000,7 @@ row_upd_del_mark_clust_rec( err = row_upd_check_references_constraints( node, pcur, index->table, index, offsets, thr, mtr); #ifdef WITH_WSREP - } else if (trx && wsrep_on(trx->mysql_thd) && err == DB_SUCCESS - && wsrep_must_process_fk(node, trx)) { + } else if (foreign && wsrep_must_process_fk(node, trx)) { err = wsrep_row_upd_check_foreign_constraints( node, pcur, index->table, index, offsets, thr, mtr); diff --git a/storage/innobase/srv/srv0conc.cc b/storage/innobase/srv/srv0conc.cc index 514586b6af6..3042040ba1b 100644 --- a/storage/innobase/srv/srv0conc.cc +++ b/storage/innobase/srv/srv0conc.cc @@ -120,7 +120,7 @@ srv_conc_enter_innodb_with_atomics( for (;;) { ulint sleep_in_us; #ifdef WITH_WSREP - if (wsrep_on(trx->mysql_thd) && + if (wsrep_on(trx->mysql_thd) && wsrep_thd_is_aborting(trx->mysql_thd)) { if (wsrep_debug) ib::info() << diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 4bf9e6b4925..504e7df339f 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -2424,8 +2424,6 @@ static bool srv_purge_should_exit() "InnoDB: to purge " ULINTPF " transactions", history_size); } -#else - (void)history_size; /* unused variable warning */ #endif return false; } diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 221cf3b78d1..3a331ebdf30 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -179,7 +179,7 @@ trx_rollback_to_savepoint( complete rollback */ { #ifdef WITH_WSREP - if (wsrep_on(trx->mysql_thd) && savept == NULL) { + if (savept == NULL && wsrep_on(trx->mysql_thd)) { wsrep_handle_SR_rollback(NULL, trx->mysql_thd); } #endif /* WITH_WSREP */

1 0

[Commits] 5c662d75: Merge tag 'release_25.3.25' into mariadb-3.x
by jan 28 Nov '18

28 Nov '18

revision-id: 5c662d7516da67f09e9edb9c3bb33125a0646511 (mariadb-25.3.19-19-g5c662d75) parent(s): c0f67cc18569a9f9b060b33094dba261202705da ddf9876eee60591c6ed1f00316fbf36bfe6d4984 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-28 14:13:09 +0200 message: Merge tag 'release_25.3.25' into mariadb-3.x SConstruct | 26 ++++++++-- galera/src/certification.cpp | 66 +++++++++++++++++++------ galera/src/certification.hpp | 5 +- galera/src/replicator_smm_params.cpp | 16 +++--- galerautils/src/gu_asio.cpp | 20 +++++++- galerautils/src/gu_digest.hpp | 1 - galerautils/src/gu_utils.c | 21 ++++---- galerautils/src/gu_vec16.h | 96 ------------------------------------ galerautils/tests/SConscript | 1 - galerautils/tests/gu_tests.c | 2 - galerautils/tests/gu_vec_test.c | 53 -------------------- galerautils/tests/gu_vec_test.h | 12 ----- scripts/build.sh | 2 +- scripts/mysql/build.sh | 2 + 14 files changed, 118 insertions(+), 205 deletions(-) diff --cc scripts/build.sh index 5e53720c,d4c18bbe..43a223a5 --- a/scripts/build.sh +++ b/scripts/build.sh @@@ -4,9 -4,6 +4,9 @@@ set -e # $Id$ +# Galera library version - VERSION="25.3.24" ++VERSION="25.3.25" + get_cores() { case $OS in

1 0

[Commits] 4862ae6f481: Fix syntax error on galera/disabled.def file
by jan 28 Nov '18

28 Nov '18

revision-id: 4862ae6f4814451c6cca33ef60ae011e91ac9caa (mariadb-10.2.19-25-g4862ae6f481) parent(s): ab398a3b8aba965bf22517eb9cd7d12383d080f4 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-28 11:53:40 +0200 message: Fix syntax error on galera/disabled.def file --- mysql-test/suite/galera/disabled.def | 2 -- 1 file changed, 2 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 9eead53c82b..9ddb96e5525 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -41,8 +41,6 @@ galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb -galera_drop_database : test -galera_ist_innodb_flush_logs galera.MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C] galera.MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C] galera.MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C]

1 0