Commit 617aaf10 authored by jani@hynda.mysql.fi's avatar jani@hynda.mysql.fi

Disabled compiler warnings mainly for Win 64.

parent 2d6d4513
...@@ -125,6 +125,7 @@ char* my_cgets(char *buffer, size_t clen, size_t* plen) ...@@ -125,6 +125,7 @@ char* my_cgets(char *buffer, size_t clen, size_t* plen)
{ {
ULONG state; ULONG state;
char *result; char *result;
DWORD plen_res;
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
pthread_auto_mutex_decl(my_conio_cs); pthread_auto_mutex_decl(my_conio_cs);
...@@ -171,7 +172,8 @@ char* my_cgets(char *buffer, size_t clen, size_t* plen) ...@@ -171,7 +172,8 @@ char* my_cgets(char *buffer, size_t clen, size_t* plen)
do do
{ {
clen= min(clen, (size_t) csbi.dwSize.X*csbi.dwSize.Y); clen= min(clen, (size_t) csbi.dwSize.X*csbi.dwSize.Y);
if (!ReadConsole((HANDLE)my_coninpfh, (LPVOID)buffer, clen - 1, plen, NULL)) if (!ReadConsole((HANDLE)my_coninpfh, (LPVOID)buffer, clen - 1, &plen_res,
NULL))
{ {
result= NULL; result= NULL;
clen>>= 1; clen>>= 1;
...@@ -183,7 +185,7 @@ char* my_cgets(char *buffer, size_t clen, size_t* plen) ...@@ -183,7 +185,7 @@ char* my_cgets(char *buffer, size_t clen, size_t* plen)
} }
} }
while (GetLastError() == ERROR_NOT_ENOUGH_MEMORY); while (GetLastError() == ERROR_NOT_ENOUGH_MEMORY);
*plen= plen_res;
if (result != NULL) if (result != NULL)
{ {
......
...@@ -1965,7 +1965,7 @@ bool ha_partition::create_handler_file(const char *name) ...@@ -1965,7 +1965,7 @@ bool ha_partition::create_handler_file(const char *name)
MYF(MY_WME))) >= 0) MYF(MY_WME))) >= 0)
{ {
result= my_write(file, (uchar *) file_buffer, tot_len_byte, result= my_write(file, (uchar *) file_buffer, tot_len_byte,
MYF(MY_WME | MY_NABP)); MYF(MY_WME | MY_NABP)) != 0;
VOID(my_close(file, MYF(0))); VOID(my_close(file, MYF(0)));
} }
else else
......
...@@ -51,6 +51,11 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.* ...@@ -51,6 +51,11 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.*
.* : conversion from '.*size_t' to 'uint32'.* .* : conversion from '.*size_t' to 'uint32'.*
.* : conversion from '.*size_t' to 'off_t'.* .* : conversion from '.*size_t' to 'off_t'.*
.* : conversion from '.*size_t' to 'size_s'.* .* : conversion from '.*size_t' to 'size_s'.*
.* : conversion from '.*size_t' to 'DWORD'.*
.* : conversion from '.*size_t' to 'uLongf'.*
.* : conversion from '.*size_t' to 'UINT'.*
.* : conversion from '.*size_t' to 'uInt'.*
.* : conversion from '.*size_t' to 'uint16'.*
# #
# The following should be fixed by the ndb team # The following should be fixed by the ndb team
...@@ -64,7 +69,9 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.* ...@@ -64,7 +69,9 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.*
# #
listener.cc : .*conversion from 'SOCKET' to 'int'.* listener.cc : .*conversion from 'SOCKET' to 'int'.*
net_serv.cc : .*conversion from 'SOCKET' to 'int'.* net_serv.cc : .*conversion from 'SOCKET' to 'int'.*
mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 567
# allow a little moving space for the warning below
mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 560-600
# #
# Wrong compiler warnings # Wrong compiler warnings
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment