diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-16 10:50:33 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-16 10:50:33 +0200 |
| commit | 43b9ff1b21b2d645e5cd52d82878a48b47b01f8d (patch) | |
| tree | 08044d9cf7c962f103a3a4f655389bcb2bec96af /sql/sql_prepare.cc | |
| parent | 1a259b885f0882f136490e13a0b0eaee56442410 (diff) | |
| parent | 2e8e78a42cbe49d2e74381c9229d2e93c8df6f0d (diff) | |
| download | mariadb-git-43b9ff1b21b2d645e5cd52d82878a48b47b01f8d.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B26261-5.0-opt
sql/mysql_priv.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
mysql-test/r/insert_update.result:
SCCS merged
mysql-test/t/insert_update.test:
SCCS merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 33a57e8bea6..85092f14624 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1070,7 +1070,7 @@ static bool mysql_test_insert(Prepared_statement *stmt, if (mysql_prepare_insert(thd, table_list, table_list->table, fields, values, update_fields, update_values, - duplic, &unused_conds, FALSE)) + duplic, &unused_conds, FALSE, FALSE, FALSE)) goto error; value_count= values->elements; |