Commit b1f6de6d authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
parents 93e8f182 17f37d95

VC++Files/client/mysqlclient.dsp

+4 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/libmysql/libmysql.dsp

+8 −0
Original line number Diff line number Diff line
@@ -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

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -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");

mysys/default.c

+3 −0
Original line number Diff line number Diff line
@@ -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/";