diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
| commit | dfc63866eb91ce5274647dc1176e2f98b5954a50 (patch) | |
| tree | 16a66be92ba2603896b1b010600df021911be256 /sql/sql_base.cc | |
| parent | 14b769cfc6bcf5e6b3142d12e26667bcec90b2cd (diff) | |
| parent | c33caca3a45cb72ed3354561d4ff9f06dc12466c (diff) | |
| download | mariadb-git-dfc63866eb91ce5274647dc1176e2f98b5954a50.tar.gz | |
Auto-merge from mysql-trunk-merge.
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) { |