1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fixes: fix compile failure in buildbot

Browse Source
This commit is contained in:
Sergey Petrunya 2010-12-06 20:44:17 +03:00
parent 82113c39b2
commit c67b895410
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
storage/xtradb/row/row0sel.c
View File

@ -4383,10 +4383,18 @@ no_gap_lock:
idx_cond_check: idx_cond_check:
if (prebuilt->idx_cond_func) { if (prebuilt->idx_cond_func) {
int res; int res;
ibool ib_res;
ut_ad(prebuilt->template_type != ROW_MYSQL_DUMMY_TEMPLATE); ut_ad(prebuilt->template_type != ROW_MYSQL_DUMMY_TEMPLATE);
offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap); offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap);
row_sel_store_mysql_rec(buf, prebuilt, rec, FALSE, ib_res= row_sel_store_mysql_rec(buf, prebuilt, rec, FALSE,
offsets, 0, prebuilt->n_index_fields); offsets, 0, prebuilt->n_index_fields);
/*
The above call will fail and return FALSE when requested to
store an "externally stored column" (afaiu, a blob). Index
Condition Pushdown is not supported for indexes with blob
columns, so we should never get this error.
*/
ut_ad(ib_res);
res= prebuilt->idx_cond_func(prebuilt->idx_cond_func_arg); res= prebuilt->idx_cond_func(prebuilt->idx_cond_func_arg);
if (res == 0) if (res == 0)
goto next_rec; goto next_rec;