database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Simplify code during review

Browse Source
This commit is contained in:
monty@mysql.com
2004-12-18 13:45:19 +02:00
parent 1e07c1a6c1
commit eb83e8a046
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -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)
} }
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)
{ {