diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | client/mysql_upgrade.c | 6 | ||||
| -rw-r--r-- | include/config-win.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 352629ab5c5..80ed7872005 100644 --- a/.bzrignore +++ b/.bzrignore @@ -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 diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 78e4acd4c1d..551be79fc99 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -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 diff --git a/include/config-win.h b/include/config-win.h index b2e1c9831d4..8d937ffed22 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -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" |