1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
This commit is contained in:
kent@mysql.com 2005-12-21 06:02:03 +01:00
commit 16bf0baf1d
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysqlslap.c
View File

@ -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>

1
mysql-test/t/disabled.def
View File

@ -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

20
sql/ha_ndbcluster.cc
View File

@ -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

2
sql/share/errmsg.txt
View File

@ -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"