mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysqldev@production.mysql.com:my/mysql-5.0-build

Browse source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
This commit is contained in:
unknown 2005-05-18 12:18:29 +02:00
commit b1f6de6de6
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
VC++Files/client/mysqlclient.dsp
View file

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

8
VC++Files/libmysql/libmysql.dsp
View 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

1
client/mysql.cc
View 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");

3
mysys/default.c
View file

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