diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-24 19:26:48 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-24 19:26:48 +0400 |
| commit | 5ac577497744a97f68715cdb372950c9e954677f (patch) | |
| tree | cb4bded9c5cfe49770c4ed0113dabbabb240da91 /sql | |
| parent | d23d1b4b8bfd2cdb35194e499a8335da42def3ba (diff) | |
| parent | a31795b82d9b2f40cb2b489c99d6d03e036f039f (diff) | |
| download | mariadb-git-5ac577497744a97f68715cdb372950c9e954677f.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rw-r--r-- | sql/sql_select.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7ae7edaf6b2..14ddccd9229 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2587,7 +2587,7 @@ make_join_statistics(JOIN *join, TABLE_LIST *tables, COND *conds, if (s->dependent & table->map) s->dependent |= table->reginfo.join_tab->dependent; } - if (s->dependent) + if (outer_join & s->table->map) s->table->maybe_null= 1; } /* Catch illegal cross references for outer joins */ diff --git a/sql/sql_select.h b/sql/sql_select.h index be159c523e0..c5961f097c2 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -285,7 +285,11 @@ public: fetching data from a cursor */ bool resume_nested_loop; - table_map const_table_map,found_const_table_map,outer_join; + table_map const_table_map,found_const_table_map; + /* + Bitmap of all inner tables from outer joins + */ + table_map outer_join; ha_rows send_records,found_records,examined_rows,row_limit, select_limit; /** Used to fetch no more than given amount of rows per one |