diff options
| author | unknown <monty@mysql.com> | 2004-12-18 13:45:19 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-18 13:45:19 +0200 |
| commit | 2ca011d4608bac018986e0509c9d74ddafca50ec (patch) | |
| tree | 1655741525f8b8f742b71c9376b9b9efb438e7f5 /sql | |
| parent | c6be66530a1391c88b250c6212fb8a26084778c8 (diff) | |
| download | mariadb-git-2ca011d4608bac018986e0509c9d74ddafca50ec.tar.gz | |
Simplify code during review
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 10 |
1 files 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) { |