From b93eb20928cb48b89b87a4113640ecd0e1b8ed3f Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 20 Dec 2005 12:56:48 +0100
Subject: [PATCH 1/4] Bug #15845  	New file "client/mysqlslap.c" break
 compilation on QNX, missing "sys/shm.h"

---
 client/mysqlslap.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index bdea771af50..a3b342bc713 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -91,9 +91,6 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <sslopt-vars.h>
-#include <sys/time.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 

From a26ae25ee651496d9382dbb9462be14460fd5310 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 20 Dec 2005 12:57:51 +0100
Subject: [PATCH 2/4] Bug #15483  	mysqlslap client fails in mysqlslap
 test.

---
 mysql-test/t/disabled.def | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index e17d8b35706..9cfb69ecd8f 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -17,6 +17,5 @@ ndb_cache_multi2: Bug#15004
 func_group      : Bug#15448
 func_math       : Bug#15448
 group_min_max   : Bug#15448 
-mysqlslap       : Bug#15483
 subselect       : Bug#15706
 type_time       : Bug#15805

From 7100dec8fef79deb9be5f4d126af53cab2342b3a Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 20 Dec 2005 20:53:29 +0100
Subject: [PATCH 3/4] BUG#15981 Current 5.1 fails for NDB tests

---
 sql/ha_ndbcluster.cc | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index fa432914477..050a6ea8af8 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -3014,6 +3014,26 @@ void ha_ndbcluster::position(const byte *record)
         }      
         *buff++= 0;
       }
+
+      size_t len = key_part->length;
+      const byte * ptr = record + key_part->offset;
+      Field *field = key_part->field;
+      if ((field->type() ==  MYSQL_TYPE_VARCHAR) &&
+	  ((Field_varstring*)field)->length_bytes == 1)
+      {
+	/** 
+	 * Keys always use 2 bytes length
+	 */
+	buff[0] = ptr[0];
+	buff[1] = 0;
+	memcpy(buff+2, ptr + 1, len);	
+	len += 2;
+      }
+      else
+      {
+	memcpy(buff, ptr, len);
+      }
+      buff += len;
     }
   } 
   else 

From cf61fa2f26669cd28ab1977f92deeee3a0aee22e Mon Sep 17 00:00:00 2001
From: "pappa@c-910be253.1238-1-64736c10.cust.bredbandsbolaget.se" <>
Date: Wed, 21 Dec 2005 00:02:02 -0500
Subject: [PATCH 4/4] Minor portability issue on big endian boxes

---
 sql/share/errmsg.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 35b6b17efa4..aa5607c9f6a 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5726,4 +5726,4 @@ ER_PLUGIN_IS_NOT_LOADED
 ER_WRONG_VALUE
 	eng "Incorrect %-.32s value: '%-.128s'"
 ER_NO_PARTITION_FOR_GIVEN_VALUE
-	eng "Table has no partition for value %d"
+	eng "Table has no partition for value %ld"