1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
This commit is contained in:
jimw@mysql.com 2006-05-01 10:59:14 -07:00
commit c571f6ff57
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -1281,3 +1281,4 @@ mysql-test/r/udf.log
extra/yassl/taocrypt/benchmark/benchmark extra/yassl/taocrypt/benchmark/benchmark
extra/yassl/taocrypt/test/test extra/yassl/taocrypt/test/test
extra/yassl/testsuite/testsuite extra/yassl/testsuite/testsuite
client/mysql_upgrade

6
client/mysql_upgrade.c
View File

@ -135,7 +135,9 @@ static int create_check_file(const char *path)
if (check_file < 0) if (check_file < 0)
return 1; 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; error= my_close(check_file, MYF(MY_FAE | MY_WME)) || error;
return error; return error;
} }
@ -243,7 +245,7 @@ int main(int argc, char **argv)
&& (test_file_exists("./bin", "mysqld") || && (test_file_exists("./bin", "mysqld") ||
test_file_exists("./libexec", "mysqld"))) test_file_exists("./libexec", "mysqld")))
{ {
getcwd(bindir, sizeof(bindir)); my_getwd(bindir, sizeof(bindir), MYF(0));
bindir_end= bindir + strlen(bindir); bindir_end= bindir + strlen(bindir);
} }
else else

1
include/config-win.h
View File

@ -367,6 +367,7 @@ inline double ulonglong2double(ulonglong value)
#include <custom_conf.h> #include <custom_conf.h>
#else #else
#define DEFAULT_MYSQL_HOME "c:\\mysql" #define DEFAULT_MYSQL_HOME "c:\\mysql"
#define DATADIR "c:\\mysql\\data"
#define PACKAGE "mysql" #define PACKAGE "mysql"
#define DEFAULT_BASEDIR "C:\\" #define DEFAULT_BASEDIR "C:\\"
#define SHAREDIR "share" #define SHAREDIR "share"