diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-10-30 11:28:19 +0100 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-10-30 11:28:19 +0100 |
| commit | c84d4b213905f37fd0095456dcdd0bfcae51a4f1 (patch) | |
| tree | 4110aa2d735ea23d41f6683de6895b0ba90e17a7 /sql/sql_update.cc | |
| parent | 7d9c59b7be412210413fc93602ec4522eb1f368b (diff) | |
| parent | 4ce44da3d5351b29e8dd0ed65bf49faeac21254b (diff) | |
| download | mariadb-git-c84d4b213905f37fd0095456dcdd0bfcae51a4f1.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl/r/rpl_bug31076.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
mysql-test/suite/rpl/t/rpl_bug31076.test:
manual merge
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 4071bb86c90..2ee823777eb 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -679,7 +679,7 @@ int mysql_update(THD *thd, */ if (will_batch && ((error= table->file->exec_bulk_update(&dup_key_found)) || - !dup_key_found)) + dup_key_found)) { if (error) { |