Skip to content

M
mariadb
Commit eb83e8a0 authored by monty@mysql.com's avatar monty@mysql.com
Browse files
Options

Simplify code during review

parent 1e07c1a6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
sql/sql_select.cc
View file @ eb83e8a0
...@@ -4951,10 +4951,7 @@ join_read_system(JOIN_TAB *tab) ...@@ -4951,10 +4951,7 @@ join_read_system(JOIN_TAB *tab)
table->file->print_error(error,MYF(0)); table->file->print_error(error,MYF(0));
return 1; return 1;
} }
if (tab->on_expr) mark_as_null_row(tab->table);
mark_as_null_row(tab->table);
else
table->null_row=1; // Why do this for inner join?
empty_record(table); // Make empty record empty_record(table); // Make empty record
return -1; return -1;
} }
...@@ -4984,10 +4981,7 @@ join_read_const(JOIN_TAB *tab) ...@@ -4984,10 +4981,7 @@ join_read_const(JOIN_TAB *tab)
} }
if (error) if (error)
{ {
if (tab->on_expr) mark_as_null_row(tab->table);
mark_as_null_row(tab->table);
else
table->null_row=1;
empty_record(table); empty_record(table);
if (error != HA_ERR_KEY_NOT_FOUND) if (error != HA_ERR_KEY_NOT_FOUND)
{ {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7