diff options
| author | unknown <gkodinov/kgeorge@rakia.(none)> | 2006-07-26 19:55:33 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@rakia.(none)> | 2006-07-26 19:55:33 +0300 |
| commit | bb81f6ac2da29383c353e109ce41834cbbe71c36 (patch) | |
| tree | 19a38e786b5094feb21559112b2ae68cbe034ec9 /sql/sql_select.cc | |
| parent | 03fc0a8fb15a785b3c2cd95adab1749d6aa7ea0f (diff) | |
| parent | 6b75e24b73828316dd1715ab32811a614ce74314 (diff) | |
| download | mariadb-git-bb81f6ac2da29383c353e109ce41834cbbe71c36.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 96ac98cfb88..339826b3692 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4470,10 +4470,16 @@ return_zero_rows(JOIN *join, select_result *result,TABLE_LIST *tables, DBUG_RETURN(0); } - +/* + used only in JOIN::clear +*/ static void clear_tables(JOIN *join) { - for (uint i=0 ; i < join->tables ; i++) + /* + must clear only the non-const tables, as const tables + are not re-calculated. + */ + for (uint i=join->const_tables ; i < join->tables ; i++) mark_as_null_row(join->table[i]); // All fields are NULL } |