From 17b55ca39b47c578329a61a07d2ffddeb3e91f22 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Thu, 16 Jun 2005 13:39:54 +0200
Subject: [PATCH] for consictency, changed to use memcpy_fixed.

---
 sql/sql_select.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 41b56ae888c..352227acc68 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -8112,9 +8112,9 @@ store_record_in_cache(JOIN_CACHE *cache)
 	     end > str && end[-1] == ' ' ;
 	     end--) ;
 	length=(uint) (end-str);
-	memcpy(pos+2, str, length);
-	int2store(pos, length);
-	pos+= length+2;
+	memcpy(pos+sizeof(length), str, length);
+	memcpy_fixed(pos, &length, sizeof(length));
+	pos+= length+sizeof(length);
       }
       else
       {
@@ -8177,9 +8177,10 @@ read_cached_record(JOIN_TAB *tab)
     {
       if (copy->strip)
       {
-	memcpy(copy->str, pos+2, length= uint2korr(pos));
+        memcpy_fixed(&length, pos, sizeof(length));
+	memcpy(copy->str, pos+sizeof(length), length);
 	memset(copy->str+length, ' ', copy->length-length);
-	pos+= 2+length;
+	pos+= sizeof(length)+length;
       }
       else
       {