diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-12-08 02:47:54 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-12-08 02:47:54 +0400 |
| commit | 8e960817640168e68631a4dba7b39d3ca2c3d6e8 (patch) | |
| tree | b1ec2a29f2d814bacf82f4201e351cf99656faff /sql/sql_lex.cc | |
| parent | 49ecc880699b9627a1fbec8fa5c4d025ccb9a7cf (diff) | |
| parent | cdd1197060c1adb458131c9d9ec2d66dbe945864 (diff) | |
| download | mariadb-git-8e960817640168e68631a4dba7b39d3ca2c3d6e8.tar.gz | |
Merge fix for BUG#868908
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 2e2bec06c06..e8a446f9c4f 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -3644,12 +3644,12 @@ bool st_select_lex::save_leaf_tables(THD *thd) { if (leaf_tables_exec.push_back(table)) return 1; - table->tablenr_exec= table->table->tablenr; - table->map_exec= table->table->map; + table->tablenr_exec= table->get_tablenr(); + table->map_exec= table->get_map(); if (join && (join->select_options & SELECT_DESCRIBE)) table->maybe_null_exec= 0; else - table->maybe_null_exec= table->table->maybe_null; + table->maybe_null_exec= table->table? table->table->maybe_null: 0; } if (arena) thd->restore_active_arena(arena, &backup); |