diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2010-09-12 13:21:25 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2010-09-12 13:21:25 +0400 |
commit | b9e5125050a749324819e9e7910673337a706e83 (patch) | |
tree | 415b24aaaea42b23241bbd5fb3f47db9f22f6aa2 /sql | |
parent | a730bb9cafd7f58b3c5cbce0fa6d4bc8c31fffdf (diff) | |
download | mariadb-git-b9e5125050a749324819e9e7910673337a706e83.tar.gz |
Remove garbage comments, coding style conformance (no functional changes).
Diffstat (limited to 'sql')
-rw-r--r-- | sql/multi_range_read.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index 2b43a880564..9ae86a287ac 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -942,9 +942,9 @@ void DsMrr_impl::dsmrr_fill_key_buffer() key_buffer.sort((qsort2_cmp)DsMrr_impl::key_tuple_cmp, (void*)this); - //psergey4: cur_range_info will point to range-info bytes. key_buffer.setup_reading(&cur_index_tuple, key_size_in_keybuf, - is_mrr_assoc? (uchar**)&cur_range_info: NULL, sizeof(void*)); + is_mrr_assoc? (uchar**)&cur_range_info: NULL, + sizeof(void*)); last_identical_key_ptr= NULL; in_identical_keys_range= FALSE; @@ -1004,8 +1004,7 @@ check_record: { continue; } - memcpy(range_info_arg, cur_range_info, sizeof(void*)); //psergey4: this copyies junk there - + memcpy(range_info_arg, cur_range_info, sizeof(void*)); return 0; } @@ -1209,12 +1208,10 @@ int DsMrr_impl::dsmrr_next(char **range_info) if (is_mrr_assoc) { memcpy(range_info, rowids_range_id, sizeof(uchar*)); - //psergey5: memcpy(&cur_range_info, rowids_range_id, sizeof(uchar*)); // psergey: ??? } if (h2->mrr_funcs.skip_record && - h2->mrr_funcs.skip_record(h2->mrr_iter, /* psergey5 (char *) - cur_range_info */ *range_info, rowid)) + h2->mrr_funcs.skip_record(h2->mrr_iter, *range_info, rowid)) continue; res= h->ha_rnd_pos(table->record[0], rowid); |