diff options
| author | unknown <monty@mysql.com> | 2005-11-24 06:23:51 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-24 06:23:51 +0200 |
| commit | 2d3d9773c13f2e914b7bb179cb8e486a8af13c87 (patch) | |
| tree | 747568234cce87c95d0f259df20b7b49d9315510 /sql/opt_range.cc | |
| parent | 7f10ea430ce2be4c4708dbdf949cd4a1058bcd3d (diff) | |
| parent | 0db7a010e4696a289c38e11eba9d6c6528e45d5c (diff) | |
| download | mariadb-git-2d3d9773c13f2e914b7bb179cb8e486a8af13c87.tar.gz | |
Merge mysql.com:/home/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1-TDC
sql/handler.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 9d555c3f512..2645a798896 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1654,11 +1654,10 @@ public: static int fill_used_fields_bitmap(PARAM *param) { TABLE *table= param->table; - param->fields_bitmap_size= (table->s->fields/8 + 1); + param->fields_bitmap_size= bitmap_buffer_size(table->s->fields+1); uint32 *tmp; uint pk; - if (!(tmp= (uint32*)alloc_root(param->mem_root, - bytes_word_aligned(param->fields_bitmap_size))) || + if (!(tmp= (uint32*) alloc_root(param->mem_root,param->fields_bitmap_size)) || bitmap_init(¶m->needed_fields, tmp, param->fields_bitmap_size*8, FALSE)) return 1; @@ -2417,7 +2416,7 @@ ROR_SCAN_INFO *make_ror_scan(const PARAM *param, int idx, SEL_ARG *sel_arg) ror_scan->records= param->table->quick_rows[keynr]; if (!(bitmap_buf= (uint32*)alloc_root(param->mem_root, - bytes_word_aligned(param->fields_bitmap_size)))) + param->fields_bitmap_size))) DBUG_RETURN(NULL); if (bitmap_init(&ror_scan->covered_fields, bitmap_buf, @@ -2537,7 +2536,7 @@ ROR_INTERSECT_INFO* ror_intersect_init(const PARAM *param) return NULL; info->param= param; if (!(buf= (uint32*)alloc_root(param->mem_root, - bytes_word_aligned(param->fields_bitmap_size)))) + param->fields_bitmap_size))) return NULL; if (bitmap_init(&info->covered_fields, buf, param->fields_bitmap_size*8, FALSE)) |