From eb83e8a046d98f1a628e600f0044c6f9f06f194f Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Sat, 18 Dec 2004 13:45:19 +0200
Subject: [PATCH] Simplify code during review

---
 sql/sql_select.cc | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 2df0d45f8ed..eda4ce73186 100644
--- 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)
       {