mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6 mysql.cc: Removed unused variable 'field' from print_warnings() libmysql.dsp: Added "my_chsize.c" and "my_seek.c" mysqlclient.dsp: Added "my_chsize.c" VC++Files/client/mysqlclient.dsp: Added "my_chsize.c" VC++Files/libmysql/libmysql.dsp: Added "my_chsize.c" and "my_seek.c" client/mysql.cc: Removed unused variable 'field' from print_warnings() mysys/default.c: Disabled use of GetSystemWindowsDirectory() when compiled with VC6
This commit is contained in:
@ -330,6 +330,10 @@ SOURCE=..\mysys\my_alloc.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\mysys\my_chsize.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\mysys\my_compress.c
|
||||
# ADD CPP /I "../zlib"
|
||||
# End Source File
|
||||
|
@ -303,6 +303,10 @@ SOURCE=..\mysys\my_alloc.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\mysys\my_chsize.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\mysys\my_compress.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -387,6 +391,10 @@ SOURCE=..\mysys\my_rename.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\mysys\my_seek.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\mysys\my_static.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -2244,7 +2244,6 @@ print_warnings()
|
||||
char query[30];
|
||||
MYSQL_RES *result;
|
||||
MYSQL_ROW cur;
|
||||
MYSQL_FIELD *field;
|
||||
|
||||
/* Get the warnings */
|
||||
strmov(query,"show warnings");
|
||||
|
@ -986,10 +986,13 @@ static void init_default_directories()
|
||||
|
||||
if (GetWindowsDirectory(system_dir,sizeof(system_dir)))
|
||||
*ptr++= &system_dir;
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
|
||||
/* Only VC7 and up */
|
||||
/* Only add shared system directory if different from default. */
|
||||
if (GetSystemWindowsDirectory(shared_system_dir,sizeof(shared_system_dir)) &&
|
||||
strcmp(system_dir, shared_system_dir))
|
||||
*ptr++= &shared_system_dir;
|
||||
#endif
|
||||
|
||||
#elif defined(__NETWARE__)
|
||||
*ptr++= "sys:/etc/";
|
||||
|
Reference in New Issue
Block a user