database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/tmp_merge

Browse Source 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2


mysql-test/r/index_merge_innodb.result:
  Auto merged
sql/opt_range.cc:
  Auto merged
This commit is contained in:
unknown
2006-04-20 17:00:29 -07:00
parent f56780ecb5 93409ee7be
commit 17e3ee3553
3 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/opt_range.cc
View File

@ -4370,7 +4370,7 @@ TRP_ROR_INTERSECT *get_best_covering_ror_intersect(PARAM *param,
sizeof(ROR_SCAN_INFO*)*
best_num)))
DBUG_RETURN(NULL);
memcpy(trp->first_scan, ror_scan_mark, best_num*sizeof(ROR_SCAN_INFO*));
memcpy(trp->first_scan, tree->ror_scans, best_num*sizeof(ROR_SCAN_INFO*));
trp->last_scan= trp->first_scan + best_num;
trp->is_covering= TRUE;
trp->read_cost= total_cost;