Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

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>
 

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

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 

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"