database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix stupid signed and unsigned conversion - When field and buffer types are different (Client receiving end)

Browse Source 
Added tests for singed and unsigned conversion (client_test.c)
This commit is contained in:
venu@myvenu.com
2003-02-05 12:21:01 -08:00
parent 4e1d69d618
commit 03fd42e601
2 changed files with 197 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libmysql/libmysql.c
View File

@ -163,11 +163,6 @@ void STDCALL mysql_thread_end()
#define reset_sigpipe(mysql)
#endif
#define map_to_size(A,L) {\
char *tmp= (char *)&A;\
memset(tmp+L,0,8-L);\
}
static MYSQL* spawn_init(MYSQL* parent, const char* host,
unsigned int port,
const char* user,
@ -3967,6 +3962,7 @@ unsigned int alloc_stmt_fields(MYSQL_STMT *stmt)
field->org_table= strdup_root(alloc,fields->org_table);
field->name = strdup_root(alloc,fields->name);
field->org_name = strdup_root(alloc,fields->org_name);
field->charsetnr= fields->charsetnr;
field->length = fields->length;
field->type = fields->type;
field->flags = fields->flags;
@ -4871,31 +4867,38 @@ static void send_data_time(MYSQL_BIND *param, MYSQL_TIME ltime,
/* Fetch data to buffers */
static void fetch_results(MYSQL_BIND *param, uint field_type, uchar **row)
static void fetch_results(MYSQL_BIND *param, uint field_type, uchar **row,
my_bool field_is_unsigned)
{
ulong length;
switch (field_type) {
case MYSQL_TYPE_TINY:
{
longlong value= (longlong) **row;
map_to_size(value,(length= 1));
send_data_long(param,value);
char value= (char) **row;
longlong data= (field_is_unsigned) ? (longlong) (unsigned char) value:
(longlong) value;
send_data_long(param,data);
length= 1;
break;
}
case MYSQL_TYPE_SHORT:
case MYSQL_TYPE_YEAR:
{
longlong value= (longlong)sint2korr(*row);
map_to_size(value,(length= 2));
send_data_long(param, value);
short value= sint2korr(*row);
longlong data= (field_is_unsigned) ? (longlong) (unsigned short) value:
(longlong) value;
send_data_long(param,data);
length= 2;
break;
}
case MYSQL_TYPE_LONG:
{
longlong value= (longlong)sint4korr(*row);
map_to_size(value,(length= 4));
send_data_long(param,value);
long value= sint4korr(*row);
longlong data= (field_is_unsigned) ? (longlong) (unsigned long) value:
(longlong) value;
send_data_long(param,data);
length= 4;
break;
}
case MYSQL_TYPE_LONGLONG:
@ -5165,7 +5168,10 @@ static int stmt_fetch_row(MYSQL_STMT *stmt, uchar *row)
if (field->type == bind->buffer_type)
(*bind->fetch_result)(bind, &row);
else
fetch_results(bind, field->type, &row);
{
my_bool field_is_unsigned= (field->flags & UNSIGNED_FLAG) ? 1: 0;
fetch_results(bind, field->type, &row, field_is_unsigned);
}
}
if (! ((bit<<=1) & 255))
{