diff --git a/sql/item.h b/sql/item.h
index 34ceae62c8e..19b7b5d03e9 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -2392,7 +2392,7 @@ public:
     if (join_tab_idx_arg < join_tab_idx)
       join_tab_idx= join_tab_idx_arg;
   }
-  virtual uint get_join_tab_idx() { return join_tab_idx; }
+  uint get_join_tab_idx() const { return join_tab_idx; }
 
   table_map view_used_tables(TABLE_LIST *view)
   {
diff --git a/sql/opt_index_cond_pushdown.cc b/sql/opt_index_cond_pushdown.cc
index 360ae028f36..15bc2074e1f 100644
--- a/sql/opt_index_cond_pushdown.cc
+++ b/sql/opt_index_cond_pushdown.cc
@@ -206,7 +206,7 @@ static Item *make_cond_for_index(THD *thd, Item *cond, TABLE *table, uint keyno,
 	  new_cond->argument_list()->push_back(fix, thd->mem_root);
           used_tables|= fix->used_tables();
         }
-        if (MY_TEST(item->marker == ICP_COND_USES_INDEX_ONLY))
+        if (item->marker == ICP_COND_USES_INDEX_ONLY)
         {
           n_marked++;
           item->marker= 0;
@@ -239,7 +239,7 @@ static Item *make_cond_for_index(THD *thd, Item *cond, TABLE *table, uint keyno,
 	if (!fix)
 	  return (COND*) 0;
 	new_cond->argument_list()->push_back(fix, thd->mem_root);
-        if (MY_TEST(item->marker == ICP_COND_USES_INDEX_ONLY))
+        if (item->marker == ICP_COND_USES_INDEX_ONLY)
         {
           n_marked++;
           item->marker= 0;