diff options
| author | unknown <pem@mysql.com> | 2004-06-07 12:09:17 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2004-06-07 12:09:17 +0200 |
| commit | 8a2b50c4a1744c23e44436020cbc3bbf286311bd (patch) | |
| tree | 0883b97aa67d08e49e6ad9a281beeae9ed3e764a /sql/sql_union.cc | |
| parent | 5a83f0c85c899bdfc7e08fd6c75c4424db37b4dd (diff) | |
| parent | b0921b1f5a1f610b04641a83d0d7b21e3fe46d84 (diff) | |
| download | mariadb-git-8a2b50c4a1744c23e44436020cbc3bbf286311bd.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0-merge
sql/sql_parse.cc:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 73d4616b313..2b7c0d8f0c0 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -487,7 +487,9 @@ int st_select_lex_unit::exec() else { JOIN_TAB *tab,*end; - for (tab=join->join_tab,end=tab+join->tables ; tab != end ; tab++) + for (tab=join->join_tab, end=tab+join->tables ; + tab && tab != end ; + tab++) { delete tab->select; delete tab->quick; |