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

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä 2019-11-14 10:51:06 +02:00
commit bc5cfe7769
2 changed files with 69 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/mariadb-plugin-mroonga.prerm vendored Normal file → Executable file
View File

@ -2,7 +2,7 @@
set -e set -e
# Install Mroonga # Uninstall Mroonga
mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true
# Always exit with success instead of leaving dpkg in a broken state # Always exit with success instead of leaving dpkg in a broken state

169
storage/innobase/mtr/mtr0mtr.cc
View File

@ -30,9 +30,7 @@ Created 11/26/1995 Heikki Tuuri
#include "buf0flu.h" #include "buf0flu.h"
#include "page0types.h" #include "page0types.h"
#include "mtr0log.h" #include "mtr0log.h"
#include "log0log.h"
#include "row0trunc.h" #include "row0trunc.h"
#include "log0recv.h" #include "log0recv.h"
/** Iterate over a memo block in reverse. */ /** Iterate over a memo block in reverse. */
@ -204,142 +202,83 @@ private:
/** Release latches and decrement the buffer fix count. /** Release latches and decrement the buffer fix count.
@param slot memo slot */ @param slot memo slot */
static static void memo_slot_release(mtr_memo_slot_t *slot)
void
memo_slot_release(mtr_memo_slot_t* slot)
{ {
switch (slot->type) { switch (slot->type) {
#ifdef UNIV_DEBUG
default:
ut_ad(!"invalid type");
break;
case MTR_MEMO_MODIFY:
break;
#endif /* UNIV_DEBUG */
case MTR_MEMO_S_LOCK:
rw_lock_s_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
case MTR_MEMO_SX_LOCK:
rw_lock_sx_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
case MTR_MEMO_X_LOCK:
rw_lock_x_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
case MTR_MEMO_BUF_FIX: case MTR_MEMO_BUF_FIX:
case MTR_MEMO_PAGE_S_FIX: case MTR_MEMO_PAGE_S_FIX:
case MTR_MEMO_PAGE_SX_FIX: case MTR_MEMO_PAGE_SX_FIX:
case MTR_MEMO_PAGE_X_FIX: { case MTR_MEMO_PAGE_X_FIX:
buf_block_t *block= reinterpret_cast<buf_block_t*>(slot->object);
buf_block_t* block;
block = reinterpret_cast<buf_block_t*>(slot->object);
buf_block_unfix(block); buf_block_unfix(block);
buf_page_release_latch(block, slot->type); buf_page_release_latch(block, slot->type);
break; break;
} }
slot->object= NULL;
case MTR_MEMO_S_LOCK:
rw_lock_s_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
case MTR_MEMO_SX_LOCK:
rw_lock_sx_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
case MTR_MEMO_X_LOCK:
rw_lock_x_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
#ifdef UNIV_DEBUG
default:
ut_ad(slot->type == MTR_MEMO_MODIFY);
#endif /* UNIV_DEBUG */
}
slot->object = NULL;
}
/** Unfix a page, do not release the latches on the page.
@param slot memo slot */
static
void
memo_block_unfix(mtr_memo_slot_t* slot)
{
switch (slot->type) {
case MTR_MEMO_BUF_FIX:
case MTR_MEMO_PAGE_S_FIX:
case MTR_MEMO_PAGE_X_FIX:
case MTR_MEMO_PAGE_SX_FIX: {
buf_block_unfix(reinterpret_cast<buf_block_t*>(slot->object));
break;
}
case MTR_MEMO_S_LOCK:
case MTR_MEMO_X_LOCK:
case MTR_MEMO_SX_LOCK:
break;
#ifdef UNIV_DEBUG
default:
#endif /* UNIV_DEBUG */
break;
}
}
/** Release latches represented by a slot.
@param slot memo slot */
static
void
memo_latch_release(mtr_memo_slot_t* slot)
{
switch (slot->type) {
case MTR_MEMO_BUF_FIX:
case MTR_MEMO_PAGE_S_FIX:
case MTR_MEMO_PAGE_SX_FIX:
case MTR_MEMO_PAGE_X_FIX: {
buf_block_t* block;
block = reinterpret_cast<buf_block_t*>(slot->object);
memo_block_unfix(slot);
buf_page_release_latch(block, slot->type);
slot->object = NULL;
break;
}
case MTR_MEMO_S_LOCK:
rw_lock_s_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
slot->object = NULL;
break;
case MTR_MEMO_X_LOCK:
rw_lock_x_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
slot->object = NULL;
break;
case MTR_MEMO_SX_LOCK:
rw_lock_sx_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
slot->object = NULL;
break;
#ifdef UNIV_DEBUG
default:
ut_ad(slot->type == MTR_MEMO_MODIFY);
slot->object = NULL;
#endif /* UNIV_DEBUG */
}
} }
/** Release the latches acquired by the mini-transaction. */ /** Release the latches acquired by the mini-transaction. */
struct ReleaseLatches { struct ReleaseLatches {
/** @return true always. */ /** @return true always. */
bool operator()(mtr_memo_slot_t* slot) const bool operator()(mtr_memo_slot_t *slot) const
{ {
if (slot->object != NULL) { if (!slot->object)
memo_latch_release(slot); return true;
switch (slot->type) {
#ifdef UNIV_DEBUG
default:
ut_ad(!"invalid type");
break;
case MTR_MEMO_MODIFY:
break;
#endif /* UNIV_DEBUG */
case MTR_MEMO_S_LOCK:
rw_lock_s_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
case MTR_MEMO_X_LOCK:
rw_lock_x_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
case MTR_MEMO_SX_LOCK:
rw_lock_sx_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
break;
case MTR_MEMO_BUF_FIX:
case MTR_MEMO_PAGE_S_FIX:
case MTR_MEMO_PAGE_SX_FIX:
case MTR_MEMO_PAGE_X_FIX:
buf_block_t *block= reinterpret_cast<buf_block_t*>(slot->object);
buf_block_unfix(block);
buf_page_release_latch(block, slot->type);
break;
} }
slot->object= NULL;
return(true); return true;
} }
}; };
/** Release the latches and blocks acquired by the mini-transaction. */ /** Release the latches and blocks acquired by the mini-transaction. */
struct ReleaseAll { struct ReleaseAll {
/** @return true always. */ /** @return true always. */
bool operator()(mtr_memo_slot_t* slot) const bool operator()(mtr_memo_slot_t *slot) const
{ {
if (slot->object != NULL) { if (slot->object)
memo_slot_release(slot); memo_slot_release(slot);
} return true;
return(true);
} }
}; };
@ -349,7 +288,7 @@ struct DebugCheck {
/** @return true always. */ /** @return true always. */
bool operator()(const mtr_memo_slot_t* slot) const bool operator()(const mtr_memo_slot_t* slot) const
{ {
ut_a(slot->object == NULL); ut_ad(!slot->object);
return(true); return(true);
} }
}; };