diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-13 13:00:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-13 13:00:38 +0100 |
| commit | e68bccc743ddd5ee9b0e47ff73b57d088f015f17 (patch) | |
| tree | f524c15c650c94dd8bab87899b04ae767544b5a2 /sql/table.cc | |
| parent | ca083a764f14233dfd7f97436629020901bd23a6 (diff) | |
| parent | 3ec4296ec413e866c3efabc8dfa94172ad5f7c04 (diff) | |
| download | mariadb-git-e68bccc743ddd5ee9b0e47ff73b57d088f015f17.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index 15fbe867c15..c949112e7ee 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -5022,10 +5022,8 @@ TABLE *TABLE_LIST::get_real_join_table() */ for (TABLE_LIST *t= ti++; t; t= ti++) tbl= t; - /* - It is impossible that the list is empty - so tbl can't be NULL after above loop. - */ + if (!tbl) + return NULL; // view/derived with no tables if (!tbl->nested_join) break; /* go deeper if we've found nested join */ |