diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-09-18 12:20:20 +0200 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-09-18 12:20:20 +0200 |
| commit | 2ec485f06eb5cdf8a38c6192690ae29045181a72 (patch) | |
| tree | ef8b29380aeeea8e3218f0c2359ac158bcaab2f6 /sql/sql_insert.cc | |
| parent | fae596aafd67aa5413f64405b85241e78e12ec87 (diff) | |
| parent | d3d3cef88c03025e69f9e3c91a0f72efb0314dc7 (diff) | |
| download | mariadb-git-2ec485f06eb5cdf8a38c6192690ae29045181a72.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index b70d11e4b26..b5dab814d08 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1002,7 +1002,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, update_non_unique_table_error(table_list, "INSERT", duplicate); DBUG_RETURN(TRUE); } - select_lex->fix_prepare_information(thd, &fake_conds); + select_lex->fix_prepare_information(thd, &fake_conds, &fake_conds); select_lex->first_execution= 0; } if (duplic == DUP_UPDATE || duplic == DUP_REPLACE) |