revision-id: 132a95a1c7945edd2327383c260751fdf42d3e26 (mariadb-10.4.3-83-g132a95a1c79) parent(s): 4eff940dde0fee130cf3a7512b1fe25fc71bbe81 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-23 22:00:33 +0100 message: ccc --- sql/sql_class.h | 2 ++ storage/maria/ma_pagecache.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sql/sql_class.h b/sql/sql_class.h index bbe9433eeb2..77773437807 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5611,6 +5611,8 @@ class select_create: public select_insert { #else #undef USE_ARIA_FOR_TMP_TABLES #endif +/* TODO: remove after big block tests */ +#undef USE_ARIA_FOR_TMP_TABLES #ifdef USE_ARIA_FOR_TMP_TABLES #define TMP_ENGINE_COLUMNDEF MARIA_COLUMNDEF diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c index aa8ffc31d0a..cdf4dd21874 100644 --- a/storage/maria/ma_pagecache.c +++ b/storage/maria/ma_pagecache.c @@ -2108,8 +2108,8 @@ static PAGECACHE_BLOCK_LINK *find_block(PAGECACHE *pagecache, if (! pagecache->used_last) { - DBUG_PRINT("XXX", ("there is NOT UNUSED blocks")); struct st_my_thread_var *thread; + DBUG_PRINT("XXX", ("there is NOT UNUSED blocks")); /* Wait until a new block is added to the LRU chain; several threads might wait here for the same page, @@ -4257,7 +4257,8 @@ my_bool pagecache_write_part(PAGECACHE *pagecache, if (file->big_block_read) { - DBUG_ASSERT(0); + //DBUG_ASSERT(0); + my_errno= HA_ERR_READ_ONLY_TRANSACTION; DBUG_RETURN(1); }