diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-06-21 16:18:58 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-06-21 16:18:58 +0530 |
| commit | 0a16b37b20595bf507ce2dd753cc0ad8e7bc4f08 (patch) | |
| tree | 5395452628c3890fc3d9eef9c1c8d7853508d990 /sql/wsrep_mysqld.cc | |
| parent | 4f40f87c48a9ee252f797b5d760a6b6f07cc3815 (diff) | |
| parent | e8a2a751212a04e835b2b03408132ecbbab52410 (diff) | |
| download | mariadb-git-bb-sachin-10.0-galera-merge.tar.gz | |
Merge remote-tracking branch 'origin/5.5-galera' into bb-sachin-10.0-galera-mergebb-sachin-10.0-galera-merge
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 353911dcfde..d1ed403aa76 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -204,8 +204,7 @@ wsrep_view_handler_cb (void* app_ctx, if (memcmp(&cluster_uuid, &view->state_id.uuid, sizeof(wsrep_uuid_t))) { - memcpy((wsrep_uuid_t*)&cluster_uuid, &view->state_id.uuid, - sizeof(cluster_uuid)); + memcpy(&cluster_uuid, &view->state_id.uuid, sizeof(cluster_uuid)); wsrep_uuid_print (&cluster_uuid, cluster_uuid_str, sizeof(cluster_uuid_str)); |