Commit 2fae1b57 authored by Sergei Golubchik's avatar Sergei Golubchik

prefer to use new flag name when possible

parent ab34aecf
......@@ -288,7 +288,7 @@ bool init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
}
/* Condition pushdown to storage engine */
if ((table->file->ha_table_flags() &
HA_MUST_USE_TABLE_CONDITION_PUSHDOWN) &&
HA_CAN_TABLE_CONDITION_PUSHDOWN) &&
select && select->cond &&
(select->cond->used_tables() & table->map) &&
!table->file->pushed_cond)
......
......@@ -9570,7 +9570,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
{
tab->table->file->pushed_cond= NULL;
if ((tab->table->file->ha_table_flags() &
HA_MUST_USE_TABLE_CONDITION_PUSHDOWN) &&
HA_CAN_TABLE_CONDITION_PUSHDOWN) &&
!first_inner_tab)
{
COND *push_cond=
......@@ -23630,7 +23630,7 @@ void JOIN_TAB::save_explain_data(Explain_table_access *eta, table_map prefix_tab
const COND *pushed_cond= tab->table->file->pushed_cond;
if ((tab->table->file->ha_table_flags() &
HA_MUST_USE_TABLE_CONDITION_PUSHDOWN) &&
HA_CAN_TABLE_CONDITION_PUSHDOWN) &&
pushed_cond)
{
eta->push_extra(ET_USING_WHERE_WITH_PUSHED_CONDITION);
......
......@@ -690,7 +690,7 @@ ulonglong ha_connect::table_flags() const
// HA_NULL_IN_KEY | not implemented yet
// HA_FAST_KEY_READ | causes error when sorting (???)
HA_NO_TRANSACTIONS | HA_DUPLICATE_KEY_NOT_IN_ORDER |
HA_NO_BLOBS | HA_MUST_USE_TABLE_CONDITION_PUSHDOWN;
HA_NO_BLOBS | HA_CAN_TABLE_CONDITION_PUSHDOWN;
ha_connect *hp= (ha_connect*)this;
PTOS pos= hp->GetTableOptionStruct();
......
......@@ -60,7 +60,7 @@ public:
#if MYSQL_VERSION_ID>50100
ulonglong table_flags () const { return HA_CAN_INDEX_BLOBS |
HA_MUST_USE_TABLE_CONDITION_PUSHDOWN; } ///< bitmap of implemented flags (see handler.h for more info)
HA_CAN_TABLE_CONDITION_PUSHDOWN; } ///< bitmap of implemented flags (see handler.h for more info)
#else
ulong table_flags () const { return HA_CAN_INDEX_BLOBS; } ///< bitmap of implemented flags (see handler.h for more info)
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment