#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:marko.makela@stripped940p3ek8rp46
3111 Marko Mäkelä 2010-06-22
buf_flush_insert_in_flush_rbt(): Silence a GCC warning
about dereferencing a type-punned pointer in an assignment.
Use memcpy instead.
modified:
storage/innobase/buf/buf0flu.c
=== modified file 'storage/innobase/buf/buf0flu.c'
--- a/storage/innobase/buf/buf0flu.c revid:marko.makela@stripped6
+++ b/storage/innobase/buf/buf0flu.c revid:marko.makela@oracle.com-20100622100527-o6edtjhfwp08urbu
@@ -114,7 +114,7 @@ buf_flush_insert_in_flush_rbt(
p_node = rbt_prev(buf_pool->flush_rbt, c_node);
if (p_node != NULL) {
- prev = *rbt_value(buf_page_t*, p_node);
+ memcpy(&prev, rbt_value(buf_page_t*, p_node), sizeof prev);
ut_a(prev != NULL);
}
Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100622100527-o6edtjhfwp08urbu.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk-innodb branch (marko.makela:3111) | marko.makela | 22 Jun |