summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-06-24 18:42:14 -0700
committerIgor Babaev <igor@askmonty.org>2011-06-24 18:42:14 -0700
commit37bac085da110a42b1d7dc3ced5e555070cb8c36 (patch)
tree90b1c1a566bfb8513cefba5ad1552fa1cd6a84de /sql/table.h
parentfb22eb1391957c151e14cb8f269fb8112f5252b1 (diff)
downloadmariadb-git-37bac085da110a42b1d7dc3ced5e555070cb8c36.tar.gz
Fixed LP bug #799499.
The following were missing in the patch for mwl106: - KEY_PART_INFO::fieldnr were not set for generated keys to access tmp tables storing the rows of materialized derived tables/views - TABLE_SHARE::column_bitmap_size was not set for tmp tables storing the rows of materialized derived tables/views. These could cause crashes or memory overwrite.
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h
index 4205b81dc12..46d6e666bc3 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -959,7 +959,7 @@ struct st_table {
uint (*next_field_no) (uchar *), uchar *arg,
bool unique);
void create_key_part_by_field(KEY *keyinfo, KEY_PART_INFO *key_part_info,
- Field *field);
+ Field *field, uint fieldnr);
void use_index(int key_to_save);
void set_table_map(table_map map_arg, uint tablenr_arg)
{