Commit 57b21b5b authored by unknown's avatar unknown
Browse files

Fix for Win build 


BitKeeper/etc/ignore:
  Added client/mysql_upgrade to the ignore list
client/mysql_upgrade.c:
  fixed for Win build
include/config-win.h:
  fixed for Win build
parent 53a4e3ee

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1281,3 +1281,4 @@ mysql-test/r/udf.log 
extra/yassl/taocrypt/benchmark/benchmark

extra/yassl/taocrypt/test/test

extra/yassl/testsuite/testsuite

client/mysql_upgrade

client/mysql_upgrade.c

+4 −2
Original line number Diff line number Diff line
@@ -135,7 +135,9 @@ static int create_check_file(const char *path) 
  if (check_file < 0)

    return 1;



  error= my_write(check_file, VERSION, strlen(VERSION), MYF(MY_WME | MY_FNABP));

  error= my_write(check_file,

                  MYSQL_SERVER_VERSION, strlen(MYSQL_SERVER_VERSION),

                  MYF(MY_WME | MY_FNABP));

  error= my_close(check_file, MYF(MY_FAE | MY_WME)) || error;

  return error;

}
@@ -243,7 +245,7 @@ int main(int argc, char **argv) 
        && (test_file_exists("./bin", "mysqld") ||

            test_file_exists("./libexec", "mysqld")))

    {

      getcwd(bindir, sizeof(bindir));

      my_getwd(bindir, sizeof(bindir), MYF(0));

      bindir_end= bindir + strlen(bindir);

    }

    else

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ inline double ulonglong2double(ulonglong value) 
#include <custom_conf.h>

#else

#define DEFAULT_MYSQL_HOME	"c:\\mysql"

#define DATADIR         	"c:\\mysql\\data"

#define PACKAGE			"mysql"

#define DEFAULT_BASEDIR		"C:\\"

#define SHAREDIR		"share"