Simplify code during review

2ca011d4 · unknown · c6be6653 · 2ca011d4
Commit 2ca011d4 authored Dec 18, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

sql/sql_select.cc sql/sql_select.cc +2 -8

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4951,10 +4951,7 @@ join_read_system(JOIN_TAB *tab)
 	table->file->print_error(error,MYF(0));
 	return 1;
      }
-      if (tab->on_expr)
-        mark_as_null_row(tab->table);
-      else
-        table->null_row=1;			// Why do this for inner join?
+      mark_as_null_row(tab->table);
      empty_record(table);			// Make empty record
      return -1;
    }
@@ -4984,10 +4981,7 @@ join_read_const(JOIN_TAB *tab)
    }
    if (error)
    {
-      if (tab->on_expr)
-        mark_as_null_row(tab->table);
-      else
-        table->null_row=1;
+      mark_as_null_row(tab->table);
      empty_record(table);
      if (error != HA_ERR_KEY_NOT_FOUND)
      {