Commit 32fc1737 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-5.0
parents 6fd6ad91 e515cd1b

include/my_sys.h

+4 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ extern void my_large_free(gptr ptr, myf my_flags); 
#endif /* _AIX */

#if defined(__MWERKS__)

#undef alloca

#define alloca __alloca

#define alloca _alloca

#endif /* __MWERKS__ */

#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)

#define alloca __builtin_alloca
@@ -836,7 +836,10 @@ my_bool my_gethwaddr(uchar *to); 
#define MAP_NOSYNC       0x0800

#define MAP_FAILED       ((void *)-1)

#define MS_SYNC          0x0000



#ifndef __NETWARE__

#define HAVE_MMAP

#endif



int my_getpagesize(void);

void *my_mmap(void *, size_t, int, int, int, my_off_t);

netware/mysql_test_run.c

+2 −0
Original line number Diff line number Diff line
@@ -1162,6 +1162,8 @@ void setup(char *file) 
  setenv("MYSQL_TCP_PORT", "3306", 1);

  snprintf(file_path, PATH_MAX*2, "%s/mysql_client_test --no-defaults --testcase--user=root --port=%u ", bin_dir, master_port); 

  setenv("MYSQL_CLIENT_TEST",file_path,1);

  snprintf(file_path, PATH_MAX*2, "%s/mysql --no-defaults --user=root --port=%u ", bin_dir, master_port);

  setenv("MYSQL",file_path,1); 

}



/******************************************************************************