diff options
| author | unknown <svoj@may.pils.ru> | 2006-10-08 15:32:00 +0500 |
|---|---|---|
| committer | unknown <svoj@may.pils.ru> | 2006-10-08 15:32:00 +0500 |
| commit | b5ae1184d7c2e5adb404579dd7fd5d0479ef9897 (patch) | |
| tree | e31b1549a26b43b43a1a0b5e881fd29fc5cb3f49 /sql/sql_update.cc | |
| parent | 76cdfbbdfee7928dee2fbc0f8f07e1e0ca0cba33 (diff) | |
| parent | 4d7a6cf766ba77c2543f82af9e3a52b2534188e8 (diff) | |
| download | mariadb-git-b5ae1184d7c2e5adb404579dd7fd5d0479ef9897.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
into may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines
sql/sql_update.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
mysql-test/r/windows.result:
Use remote.
mysql-test/t/windows.test:
Use remote.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index bab4f464573..51ec287a6cb 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1217,6 +1217,8 @@ multi_update::initialize_tables(JOIN *join) TMP_TABLE_PARAM *tmp_param; table->mark_columns_needed_for_update(); + if (ignore) + table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); if (table == main_table) // First table in join { if (safe_update_on_fly(join->join_tab)) @@ -1331,7 +1333,11 @@ multi_update::~multi_update() { TABLE_LIST *table; for (table= update_tables ; table; table= table->next_local) + { table->table->no_keyread= table->table->no_cache= 0; + if (ignore) + table->table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); + } if (tmp_tables) { |