database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge Bug#7391 from 4.0

Browse Source
This commit is contained in:
antony@ltantony.rdg.cyberkinetica.homeunix.net
2004-12-18 15:12:10 +00:00
parent ae3028e5a3 27133a48db
commit 1be319a708
5 changed files with 158 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_select.cc
View File

@ -6005,10 +6005,7 @@ join_read_system(JOIN_TAB *tab)
{
if (error != HA_ERR_END_OF_FILE)
return report_error(table, error);
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;
}
@ -6038,10 +6035,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)
return report_error(table, error);