diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-11 17:48:20 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-11 17:48:20 +0500 |
| commit | 62db8d6db5366850691e7c5ead13417c55f7271f (patch) | |
| tree | b0d602acfe8228c733fde1a7ca89a2425a65fd9f /sql | |
| parent | f4ded1f2a1983f36b928265537c1e8c9867b8add (diff) | |
| parent | 563b1297bbeef6f162513be314676d0d2c39b4a9 (diff) | |
| download | mariadb-git-62db8d6db5366850691e7c5ead13417c55f7271f.tar.gz | |
Merge mysql.com:/home/hf/work/27957/my50-27957
into mysql.com:/home/hf/work/27957/my51-27957
mysql-test/r/insert_update.result:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/include/mix1.inc:
merging
mysql-test/r/innodb_mysql.result:
SCCS merged
sql/sql_select.cc:
merging
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_insert.cc | 3 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 30d7b5bc5db..ab9449ad2df 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1276,7 +1276,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) DBUG_ASSERT(info->update_fields->elements == info->update_values->elements); if (fill_record_n_invoke_before_triggers(thd, *info->update_fields, - *info->update_values, 0, + *info->update_values, + info->ignore, table->triggers, TRG_EVENT_UPDATE)) goto before_trg_err; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 20edf37fe1a..ea78e126d9c 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4269,7 +4269,7 @@ best_access_path(JOIN *join, !(s->quick && best_key && s->quick->index == best_key->key && // (2) best_max_key_part >= s->table->quick_key_parts[best_key->key]) &&// (2) !((s->table->file->ha_table_flags() & HA_TABLE_SCAN_ON_INDEX) && // (3) - ! s->table->covering_keys.is_clear_all() && best_key) && // (3) + ! s->table->covering_keys.is_clear_all() && best_key && !s->quick) &&// (3) !(s->table->force_index && best_key && !s->quick)) // (4) { // Check full join ha_rows rnd_records= s->found_records; |