diff options
| author | unknown <sergefp@mysql.com> | 2005-10-25 19:28:27 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-10-25 19:28:27 +0400 |
| commit | 2b7f5a45e96413f88ba93ebd85971a3b82cbeb7c (patch) | |
| tree | 5de18844ff69573fffda746669424dbe86b91bf3 /sql/sql_prepare.cc | |
| parent | 11541107b83d8e361722dff601192bd7d7f70ca9 (diff) | |
| download | mariadb-git-2b7f5a45e96413f88ba93ebd85971a3b82cbeb7c.tar.gz | |
BUG#13126: When choosing join order for join with nested joins, don't produce join
orders that cannot be handled by the executioner.
mysql-test/r/bigint.result:
Added mssing "drop table if exists"
mysql-test/r/join_nested.result:
Testcase for BUG#13126
mysql-test/t/bigint.test:
Added mssing "drop table if exists"
mysql-test/t/join_nested.test:
Testcase for BUG#13126
sql/mysql_priv.h:
BUG#13126: Added nested_join_map type.
sql/sql_prepare.cc:
BUG#13126: Don't set NESTED_JOIN::counter to 0 here as it is reset in other place now.
sql/sql_select.cc:
BUG#13126: When choosing join order for join with nested joins, don't produce join orders
that the executioner cannot handle. The work is done by check_interleaving_with_nj() and
restore_prev_nj_state() functions that are used from the join optimizer to avoid building
invalid join orders.
sql/sql_select.h:
BUG#13126: Added JOIN_TAB::embedding_map and JOIN::cur_embedding_map.
sql/table.h:
BUG#13126: In NESTED_JOIN: added nj_map, added comment about where counter is used.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 5f3539ca1e9..bf74dd99a68 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2105,8 +2105,6 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) were closed in the end of previous prepare or execute call. */ tables->table= 0; - if (tables->nested_join) - tables->nested_join->counter= 0; if (tables->prep_on_expr) { |