Fix GCC 9.3.0 -Wstrict-aliasing

dr-m · dr-m · commit 51a9dd67931b · 2020-04-01T11:33:58.000+03:00
copy_keys_from_share(): Use reinterpret_cast instead of manipulating a reference to a type-punned pointer. This cleans up after the cleanup commit 0515577.
diff --git a/sql/table.cc b/sql/table.cc
@@ -3745,7 +3745,8 @@ bool copy_keys_from_share(TABLE *outparam, MEM_ROOT *root)
          key_info++)
     {
       key_info->table= outparam;
-      (uchar*&)(key_info->key_part)+= adjust_ptrs;
+      key_info->key_part= reinterpret_cast<KEY_PART_INFO*>
+        (reinterpret_cast<char*>(key_info->key_part) + adjust_ptrs);
       if (key_info->algorithm == HA_KEY_ALG_LONG_HASH)
         key_info->flags&= ~HA_NOSAME;
     }

Original file line number	Diff line number	Diff line change
`@@ -3745,7 +3745,8 @@ bool copy_keys_from_share(TABLE outparam, MEM_ROOT root)`
`3745`	`3745`	`key_info++)`
`3746`	`3746`	`{`
`3747`	`3747`	`key_info->table= outparam;`
`3748`		`- (uchar*&)(key_info->key_part)+= adjust_ptrs;`
	`3748`	`+ key_info->key_part= reinterpret_cast<KEY_PART_INFO*>`
	`3749`	`+ (reinterpret_cast<char*>(key_info->key_part) + adjust_ptrs);`
`3749`	`3750`	`if (key_info->algorithm == HA_KEY_ALG_LONG_HASH)`
`3750`	`3751`	`key_info->flags&= ~HA_NOSAME;`
`3751`	`3752`	`}`