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

manual merge from mysql-5.1-bugteam

Browse Source
This commit is contained in:
Jon Olav Hauglid
2010-07-19 11:21:24 +02:00
parent 2c3a562600 85e5ce0ba0
commit 80371ba644
7 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/opt_range.h
View File

@ -825,7 +825,11 @@ class SQL_SELECT :public Sql_alloc {
tmp.set_all();
return test_quick_select(thd, tmp, 0, limit, force_quick_range) < 0;
}
inline bool skip_record() { return cond ? cond->val_int() == 0 : 0; }
inline bool skip_record(THD *thd, bool *skip_record)
{
*skip_record= cond ? cond->val_int() == FALSE : FALSE;
return thd->is_error();
}
int test_quick_select(THD *thd, key_map keys, table_map prev_tables,
ha_rows limit, bool force_quick_range);
};