diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index f4ac0948cd3..10064590a75 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -1812,10 +1812,6 @@ enum_nested_loop_state JOIN_CACHE_BNL::join_matching_records(bool skip_last)
       if (err < 0)
         return NESTED_LOOP_ERROR;
       rc= NESTED_LOOP_OK;
-      //psergey3-merge: todo: check if all other places in this file
-      //  should have the 
-      //     skip_record(...) <0  -->  return error
-      //  code.
 
       /* Prepare to read records from the join buffer */
       reset(FALSE);
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d2a72bcb86b..82fd0c9f3bf 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6052,7 +6052,6 @@ get_best_combination(JOIN *join)
     TABLE *form;
     *j= *join->best_positions[tablenr].table;
     form=join->table[tablenr]=j->table;
- //psergey-merge: or is the above:   form=join->all_tables[tablenr]=j->table;
     used_tables|= form->map;
     form->reginfo.join_tab=j;
     if (!*j->on_expr_ref)
@@ -10114,16 +10113,10 @@ static uint reset_nj_counters(JOIN *join, List<TABLE_LIST> *join_list)
     if ((nested_join= table->nested_join))
     {
       nested_join->counter= 0;
-      //nested_join->n_tables= my_count_bits(nested_join->used_tables & 
-      //                                     ~join->eliminated_tables);
       nested_join->n_tables= reset_nj_counters(join, &nested_join->join_list);
       if (!nested_join->n_tables)
         is_eliminated_nest= TRUE;
     }
-    //if (!table->table || (table->table->map & ~join->eliminated_tables))
-    //psergey-merge10^
-    //if (!table->table && (table->table->map & ~join->eliminated_tables))
-    //psergey-merge11^
     if ((!table->table && !is_eliminated_nest) || 
         (table->table && (table->table->map & ~join->eliminated_tables)))
       n++;