Merge lp:~sergei.glushchenko/percona-server/56-bug1157037 into lp:percona-server/5.6

Proposed by Sergei Glushchenko on 2013-03-22
Status: Rejected
Rejected by: Laurynas Biveinis on 2013-05-13
Proposed branch: lp:~sergei.glushchenko/percona-server/56-bug1157037
Merge into: lp:percona-server/5.6
Diff against target: 17 lines (+1/-6)
1 file modified
Percona-Server/sql/sql_tmp_table.cc (+1/-6)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/56-bug1157037
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2013-03-22 Disapprove on 2013-05-13
Review via email: mp+154853@code.launchpad.net

Description of the change

Bug 1157037 create_duplicate_weedout_tmp_table() leaves key_part_flag uninitialized
Manual initialization of key_part_info fields has been replaced with
KEY_PART_INFO::init_from_field invocation

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/60/

To post a comment you must log in.

Unmerged revisions

323. By Sergei Glushchenko on 2013-03-21

Bug 1157037 create_duplicate_weedout_tmp_table() leaves key_part_flag uninitialized
Manual initialization of key_part_info fields has been replaced with
KEY_PART_INFO::init_from_field invocation.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/sql/sql_tmp_table.cc'
2--- Percona-Server/sql/sql_tmp_table.cc 2013-02-12 07:47:19 +0000
3+++ Percona-Server/sql/sql_tmp_table.cc 2013-03-22 04:56:25 +0000
4@@ -1395,12 +1395,7 @@
5 keyinfo->algorithm= HA_KEY_ALG_UNDEF;
6 keyinfo->name= (char*) "weedout_key";
7 {
8- key_part_info->null_bit=0;
9- key_part_info->field= field;
10- key_part_info->offset= field->offset(table->record[0]);
11- key_part_info->length= (uint16) field->key_length();
12- key_part_info->type= (uint8) field->key_type();
13- key_part_info->key_type = FIELDFLAG_BINARY;
14+ key_part_info->init_from_field(field);
15 if (!using_unique_constraint)
16 {
17 key_field= field->new_key_field(thd->mem_root, table, group_buff);

Subscribers

People subscribed via source and target branches