1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Fix for BUG#5837 - attempt 3.

Call mark_as_null_row in join_read_const and join_read_system.
This commit is contained in:
sergefp@mysql.com
2004-12-11 15:51:52 +03:00
parent e8885a0824
commit 6b55909673
4 changed files with 31 additions and 4 deletions

View File

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