Portability fixes (for windows)

Some changes to the prepared statement protocol to make it easier to use and faster.
This commit is contained in:
monty@mashka.mysql.fi 2003-01-21 21:07:59 +02:00
commit 25c393a12e
69 changed files with 945 additions and 871 deletions

View file

@ -105,9 +105,9 @@ static int my_wc_mb_bin(CHARSET_INFO *cs __attribute__((unused)),
unsigned char *s,
unsigned char *e __attribute__((unused)))
{
if ( wc<256 )
if (wc < 256)
{
s[0]=wc;
s[0]= (char) wc;
return 1;
}
return MY_CS_ILUNI;
@ -296,7 +296,7 @@ static CHARSET_INFO my_charset_bin_st =
my_strncasecmp_bin, /* strncasecmp */
my_hash_caseup_bin, /* hash_caseup */
my_hash_sort_bin, /* hash_sort */
255, /* max_sort_char */
(char) 255, /* max_sort_char */
my_snprintf_8bit, /* snprintf */
my_long10_to_str_8bit,
my_longlong10_to_str_8bit,

View file

@ -16,6 +16,7 @@
#include <my_global.h>
#include "m_ctype.h"
#include "m_string.h"
#ifdef USE_MB

View file

@ -4018,7 +4018,7 @@ static int fill_uchar(uchar *a,uint size,const char *str, uint len)
for ( ; (s < e) && !strchr(" \t\r\n",s[0]); s++) ;
if (s == b || i > size)
break;
a[i]= my_strntoul(my_charset_latin1,b,s-b,16,NULL,&err);
a[i]= (uchar) my_strntoul(my_charset_latin1,b,s-b,16,NULL,&err);
}
return 0;
}
@ -4036,7 +4036,7 @@ static int fill_uint16(uint16 *a,uint size,const char *str, uint len)
for ( ; (s < e) && !strchr(" \t\r\n",s[0]); s++) ;
if (s == b || i > size)
break;
a[i]= my_strntol(my_charset_latin1,b,s-b,16,NULL,&err);
a[i]= (uint16) my_strntol(my_charset_latin1,b,s-b,16,NULL,&err);
}
return 0;
}