Commit e05de07e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-build 

into mysql.com:/home/jimw/my/mysql-5.0-clean


mysys/default.c:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged
parents 38c78b8b 6e1e571b

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
@@ -851,10 +851,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/";

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'` 
system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'`



# Use the override --machine if present

if [ -n $MACHINE ] ; then

if [ -n "$MACHINE" ] ; then

  machine=$MACHINE

fi