diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 23:49:44 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 23:49:44 +0400 |
| commit | 1cc700a7411a5aa19c2e7e4767c4c9216b7bdffb (patch) | |
| tree | cc2f1f26818537577224e50597d0764648b602d2 /sql/sql_insert.cc | |
| parent | 0b7ba9c2dc192e61b2c9b0f7a32cc8e15255af85 (diff) | |
| parent | 4bd7d6c524a7b3b61fc7d346d83df94ffea18b7e (diff) | |
| download | mariadb-git-1cc700a7411a5aa19c2e7e4767c4c9216b7bdffb.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
sql/item_cmpfunc.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index d24230eb379..773383c2c2d 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2466,12 +2466,14 @@ bool mysql_insert_select_prepare(THD *thd) DBUG_ASSERT(select_lex->leaf_tables != 0); lex->leaf_tables_insert= select_lex->leaf_tables; /* skip all leaf tables belonged to view where we are insert */ - for (first_select_leaf_table= select_lex->leaf_tables->next_leaf; + for (first_select_leaf_table= select_lex->leaf_tables->next_leaf, + thd->leaf_count --; first_select_leaf_table && first_select_leaf_table->belong_to_view && first_select_leaf_table->belong_to_view == lex->leaf_tables_insert->belong_to_view; - first_select_leaf_table= first_select_leaf_table->next_leaf) + first_select_leaf_table= first_select_leaf_table->next_leaf, + thd->leaf_count --) {} select_lex->leaf_tables= first_select_leaf_table; DBUG_RETURN(FALSE); |