diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-17 07:58:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-17 07:58:41 +0200 |
| commit | c7ba92372b8e21c42eb5df20f080c941fc84a144 (patch) | |
| tree | 7e74d58b0a47b556a1b411ed0ad14e38384d6991 /storage/maria | |
| parent | 023d9867327c0c5dfe95173c0731940fe6df74ab (diff) | |
| parent | 097e2f9d0aa0dc7f1c4a7cff52260944db28e3c8 (diff) | |
| download | mariadb-git-c7ba92372b8e21c42eb5df20f080c941fc84a144.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_page.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_page.c b/storage/maria/ma_page.c index 41278597b0c..13f5b7d698b 100644 --- a/storage/maria/ma_page.c +++ b/storage/maria/ma_page.c @@ -1,4 +1,5 @@ /* Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + Copyright (c) 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -112,7 +113,7 @@ my_bool _ma_fetch_keypage(MARIA_PAGE *page, MARIA_HA *info, if (lock != PAGECACHE_LOCK_LEFT_UNLOCKED) { - DBUG_ASSERT(lock == PAGECACHE_LOCK_WRITE || PAGECACHE_LOCK_READ); + DBUG_ASSERT(lock == PAGECACHE_LOCK_WRITE || lock == PAGECACHE_LOCK_READ); page_link.unlock= (lock == PAGECACHE_LOCK_WRITE ? PAGECACHE_LOCK_WRITE_UNLOCK : PAGECACHE_LOCK_READ_UNLOCK); |