diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-07-29 20:27:20 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-07-29 20:27:20 +0400 |
| commit | 2c9c3b0955b72128679991176ae248366815cd97 (patch) | |
| tree | c8978a50e8dd9881045d03fb1a57f577e65e0f1a /sql/sql_base.cc | |
| parent | 5861d8e7682833fa29173af9264e398c39d63451 (diff) | |
| parent | ca4c028267d0abba049f5cd587ae4cab447428b1 (diff) | |
| download | mariadb-git-2c9c3b0955b72128679991176ae248366815cd97.tar.gz | |
Merge trunk-bugfixing -> trunk-runtime.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 3dd5a7bfcc5..e810d5fc091 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5764,7 +5764,7 @@ static void update_field_dependencies(THD *thd, Field *field, TABLE *table) DBUG_ENTER("update_field_dependencies"); if (thd->mark_used_columns != MARK_COLUMNS_NONE) { - MY_BITMAP *current_bitmap, *other_bitmap; + MY_BITMAP *bitmap; /* We always want to register the used keys, as the column bitmap may have @@ -5775,15 +5775,9 @@ static void update_field_dependencies(THD *thd, Field *field, TABLE *table) table->merge_keys.merge(field->part_of_key); if (thd->mark_used_columns == MARK_COLUMNS_READ) - { - current_bitmap= table->read_set; - other_bitmap= table->write_set; - } + bitmap= table->read_set; else - { - current_bitmap= table->write_set; - other_bitmap= table->read_set; - } + bitmap= table->write_set; /* The test-and-set mechanism in the bitmap is not reliable during @@ -5792,7 +5786,7 @@ static void update_field_dependencies(THD *thd, Field *field, TABLE *table) only those columns that are used in the SET clause. I.e they are being set here. See multi_update::prepare() */ - if (bitmap_fast_test_and_set(current_bitmap, field->field_index)) + if (bitmap_fast_test_and_set(bitmap, field->field_index)) { if (thd->mark_used_columns == MARK_COLUMNS_WRITE) { |