diff options
| author | unknown <evgen@moonbone.local> | 2006-01-13 16:27:38 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-01-13 16:27:38 +0300 |
| commit | d48a3e12622606148d281da7ea0cebb2e3618ea9 (patch) | |
| tree | 3062fb6d2e69a8d993d959081f04a1a1209e6abe /sql/sql_select.cc | |
| parent | 76a1e157c0818babb0318804b9f38434ba6ed3e4 (diff) | |
| parent | 511078bf2e58fc9e3f4ebde706bac7f6d6e46a40 (diff) | |
| download | mariadb-git-d48a3e12622606148d281da7ea0cebb2e3618ea9.tar.gz | |
Merge
sql/sql_select.cc:
Auto merged
mysql-test/r/select.result:
SCCS merged
mysql-test/t/select.test:
SCCS merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 8be8dd3e599..ab58fda8dea 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9896,6 +9896,7 @@ flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last) int error; READ_RECORD *info; + join_tab->table->null_row= 0; if (!join_tab->cache.records) return NESTED_LOOP_OK; /* Nothing to do */ if (skip_last) |