summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
diff options
context:
space:
mode:
authorTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2011-10-19 03:21:31 +0100
committerTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2011-10-19 03:21:31 +0100
commit8444b6a1149aad457f8d584e0d410c3be9cd4336 (patch)
treedad66f78fd97dc1c6ad37787e2824fbe831506bf /sql/sp_head.cc
parent5dc553cd28853b6bce70644a52d835b595fde12a (diff)
downloadmariadb-git-8444b6a1149aad457f8d584e0d410c3be9cd4336.tar.gz
Bug12589870 post-merge fixes for Sparc64 and friends
sql/sp_head.cc: alignment-safe copy sql/sql_cache.cc: alignment-safe copy sql/sql_parse.cc: alignment-safe copy
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r--sql/sp_head.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 70ffb0a36ab..8bea0be0f56 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1044,7 +1044,7 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
{
memcpy(pbuf, qbuf.ptr(), qbuf.length());
pbuf[qbuf.length()]= 0;
- *(size_t *)(pbuf+qbuf.length()+1)= thd->db_length;
+ memcpy(pbuf+qbuf.length()+1, (char *) &thd->db_length, sizeof(size_t));
}
else
DBUG_RETURN(TRUE);