Commit 5fbb81ff authored by unknown's avatar unknown

configure fix to get Linux to work with new large file system detection


sql/mysqld.cc:
  Don't create pid file when using --bootstrap
  Fixed option --bdb-shared-data
  Cleanups
parent 766c3e67
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
/* Do we have FIONREAD */ /* Do we have FIONREAD */
#undef FIONREAD_IN_SYS_IOCTL #undef FIONREAD_IN_SYS_IOCTL
/* Do we need to define _GNU_SOURCE */
#undef _GNU_SOURCE
/* atomic_add() from <asm/atomic.h> (Linux only) */ /* atomic_add() from <asm/atomic.h> (Linux only) */
#undef HAVE_ATOMIC_ADD #undef HAVE_ATOMIC_ADD
......
...@@ -904,9 +904,13 @@ AC_DEFUN(AC_SYS_LARGEFILE, ...@@ -904,9 +904,13 @@ AC_DEFUN(AC_SYS_LARGEFILE,
AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
ac_cv_sys_large_files, ac_cv_sys_large_files,
[Define for large files, on AIX-style hosts.]) [Define for large files, on AIX-style hosts.])
if test "$IS_LINUX" = "true"; then
AC_DEFINE(_GNU_SOURCE)
else
AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500, AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,
ac_cv_sys_xopen_source, ac_cv_sys_xopen_source,
[Define to make ftello visible on some hosts (e.g. glibc 2.1.3).], [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
[#include <stdio.h>], [return !ftello;]) [#include <stdio.h>], [return !ftello;])
fi fi
fi
]) ])
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
/* Fix problem with S_ISLNK() on Linux */ /* Fix problem with S_ISLNK() on Linux */
#if defined(HAVE_LINUXTHREADS) #if defined(HAVE_LINUXTHREADS)
#undef _GNU_SOURCE
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#endif #endif
......
...@@ -612,6 +612,7 @@ void clean_up(void) ...@@ -612,6 +612,7 @@ void clean_up(void)
my_free(mysql_tmpdir,MYF(0)); my_free(mysql_tmpdir,MYF(0));
x_free(opt_bin_logname); x_free(opt_bin_logname);
#ifndef __WIN__ #ifndef __WIN__
if (!opt_bootstrap)
(void) my_delete(pidfile_name,MYF(0)); // This may not always exist (void) my_delete(pidfile_name,MYF(0)); // This may not always exist
#endif #endif
end_slave(); end_slave();
...@@ -1150,13 +1151,15 @@ static void *signal_hand(void *arg __attribute__((unused))) ...@@ -1150,13 +1151,15 @@ static void *signal_hand(void *arg __attribute__((unused)))
(void) sigaddset(&set,SIGTSTP); (void) sigaddset(&set,SIGTSTP);
/* Save pid to this process (or thread on Linux) */ /* Save pid to this process (or thread on Linux) */
if (!opt_bootstrap)
{ {
FILE *pidFile; File pidFile;
if ((pidFile = my_fopen(pidfile_name,O_WRONLY,MYF(MY_WME)))) if ((pidFile = my_create(pidfile_name,0664, O_WRONLY, MYF(MY_WME))) >= 0)
{ {
fprintf(pidFile,"%lu",(ulong) getpid()); char buff[21];
(void) my_fclose(pidFile,MYF(0)); sprintf(buff,"%lu",(ulong) getpid());
(void) chmod(pidfile_name,0644); (void) my_write(pidFile, buff,sizeof(buff),MYF(MY_WME));
(void) my_close(pidFile,MYF(0));
} }
} }
...@@ -1508,16 +1511,16 @@ int main(int argc, char **argv) ...@@ -1508,16 +1511,16 @@ int main(int argc, char **argv)
if (opt_bin_log && !server_id) if (opt_bin_log && !server_id)
{ {
server_id= !master_host ? 1 : 2; server_id= !master_host ? 1 : 2;
switch(server_id) switch (server_id) {
{
case 1: case 1:
sql_print_error("Warning: one should set \ sql_print_error("\
server_id to a non-0 value if log-bin is enabled. Will log updates to \ Warning: one should set server_id to a non-0 value if log-bin is enabled.\n\
binary log, but will not accept connections from slaves"); Will log updates to binary log, but will not accept connections from slaves");
break; break;
default: default:
sql_print_error("Warning: one should set server_id to a non-0 value\ sql_print_error("\
if master_host is set. The server will not act as a slave"); Warning: one should set server_id to a non-0 value if master_host is set.\n\
The server will not act as a slave");
break; break;
} }
} }
...@@ -1589,6 +1592,7 @@ if master_host is set. The server will not act as a slave"); ...@@ -1589,6 +1592,7 @@ if master_host is set. The server will not act as a slave");
select_thread_in_use=0; select_thread_in_use=0;
(void) pthread_kill(signal_thread,MYSQL_KILL_SIGNAL); (void) pthread_kill(signal_thread,MYSQL_KILL_SIGNAL);
#ifndef __WIN__ #ifndef __WIN__
if (!opt_bootstrap)
(void) my_delete(pidfile_name,MYF(MY_WME)); // Not neaded anymore (void) my_delete(pidfile_name,MYF(MY_WME)); // Not neaded anymore
#endif #endif
exit(1); exit(1);
...@@ -2249,7 +2253,7 @@ static struct option long_options[] = { ...@@ -2249,7 +2253,7 @@ static struct option long_options[] = {
{"bdb-logdir", required_argument, 0, (int) OPT_BDB_LOG}, {"bdb-logdir", required_argument, 0, (int) OPT_BDB_LOG},
{"bdb-recover", no_argument, 0, (int) OPT_BDB_RECOVER}, {"bdb-recover", no_argument, 0, (int) OPT_BDB_RECOVER},
{"bdb-no-sync", no_argument, 0, (int) OPT_BDB_NOSYNC}, {"bdb-no-sync", no_argument, 0, (int) OPT_BDB_NOSYNC},
{"bdb-shared-data", required_argument, 0, (int) OPT_BDB_SHARED}, {"bdb-shared-data", no_argument, 0, (int) OPT_BDB_SHARED},
{"bdb-tmpdir", required_argument, 0, (int) OPT_BDB_TMP}, {"bdb-tmpdir", required_argument, 0, (int) OPT_BDB_TMP},
#endif #endif
{"big-tables", no_argument, 0, (int) OPT_BIG_TABLES}, {"big-tables", no_argument, 0, (int) OPT_BIG_TABLES},
...@@ -2909,7 +2913,7 @@ static void get_options(int argc,char **argv) ...@@ -2909,7 +2913,7 @@ static void get_options(int argc,char **argv)
usage(); usage();
exit(0); exit(0);
case 'T': case 'T':
test_flags= optarg ? (uint) atoi(optarg) : (uint) ~0; test_flags= optarg ? (uint) atoi(optarg) : 0;
opt_endinfo=1; opt_endinfo=1;
break; break;
case 'S': case 'S':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment