database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge maria-5.5-mwl248 -> 10.0-base.

Browse Source
This commit is contained in:
Igor Babaev
2012-12-16 21:33:17 -08:00
parent 7760efad74 e44253a125
commit 1b62f0f58c
89 changed files with 8929 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_join_cache.cc
View File

@ -3812,7 +3812,8 @@ uint JOIN_TAB_SCAN_MRR::aux_buffer_incr(ulong recno)
uint incr= 0;
TABLE_REF *ref= &join_tab->ref;
TABLE *tab= join_tab->table;
uint rec_per_key= tab->key_info[ref->key].rec_per_key[ref->key_parts-1];
uint rec_per_key=
tab->key_info[ref->key].actual_rec_per_key(ref->key_parts-1);
set_if_bigger(rec_per_key, 1);
if (recno == 1)
incr= ref->key_length + tab->file->ref_length;