database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '11.6' into 11.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-11-09 19:01:12 +01:00
parent 7aa28a2a54 d8dad8c3b5
commit b12ff287ec
789 changed files with 10342 additions and 4415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_join_cache.cc
View File

@@ -4569,7 +4569,7 @@ bool JOIN_CACHE_BKA::skip_index_tuple(range_id_t range_info)
{
DBUG_ENTER("JOIN_CACHE_BKA::skip_index_tuple");
get_record_by_pos((uchar*)range_info);
DBUG_RETURN(!join_tab->cache_idx_cond->val_int());
DBUG_RETURN(!join_tab->cache_idx_cond->val_bool());
}
@@ -4833,7 +4833,7 @@ bool JOIN_CACHE_BKAH::skip_index_tuple(range_id_t range_info)
next_rec_ref_ptr= get_next_rec_ref(next_rec_ref_ptr);
uchar *rec_ptr= next_rec_ref_ptr + rec_fields_offset;
get_record_by_pos(rec_ptr);
if (join_tab->cache_idx_cond->val_int())
if (join_tab->cache_idx_cond->val_bool())
DBUG_RETURN(FALSE);
} while(next_rec_ref_ptr != last_rec_ref_ptr);
DBUG_RETURN(TRUE);