Bug12589870 post-merge fixes for Sparc64 and friends

1 files changed, 4 insertions, 2 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a88cc2fa8e5..989c3e0f42f 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -492,6 +492,8 @@ static void handle_bootstrap_impl(THD *thd)
     query= (char *) thd->memdup_w_gap(buff, length + 1,
                                       thd->db_length + 1 +
                                       QUERY_CACHE_FLAGS_SIZE);
+    size_t db_len= 0;
+    memcpy(query + length + 1, (char *) &db_len, sizeof(size_t));
     thd->set_query(query, length);
     DBUG_PRINT("query",("%-.4096s", thd->query()));
 #if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
@@ -1933,8 +1935,8 @@ bool alloc_query(THD *thd, const char *packet, uint packet_length)
     also store this length, in case current database is changed during
     execution.  We might need to reallocate the 'query' buffer
   */
-  size_t *len = (size_t *) (query + packet_length + 1);
-  *len= thd->db_length;
+  char *len_pos = (query + packet_length + 1);
+  memcpy(len_pos, (char *) &thd->db_length, sizeof(size_t));
     
   thd->set_query(query, packet_length);