diff options
| author | unknown <serg@sergbook.mysql.com> | 2005-01-07 15:02:25 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2005-01-07 15:02:25 +0200 |
| commit | b194c1c1ce61c94c6a35d4825aefb024288b99d3 (patch) | |
| tree | 367721392581d90d303dae4bddcea91c6d5fd6de /configure.in | |
| parent | e1073b1f04fc64f3299282b08c3353109469be6e (diff) | |
| parent | 9ad1b390fcf12ec7aa7b9fad157d6e0a61045b40 (diff) | |
| download | mariadb-git-b194c1c1ce61c94c6a35d4825aefb024288b99d3.tar.gz | |
merge
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
manually merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 52906514c89..198e2407541 100644 --- a/configure.in +++ b/configure.in @@ -1922,7 +1922,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ pthread_key_delete pthread_rwlock_rdlock pthread_setprio \ pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \ realpath rename rint rwlock_init setupterm \ - shmget shmat shmdt shmctl \ + shmget shmat shmdt shmctl sigaction \ sighold sigset sigthreadmask \ snprintf socket stpcpy strcasecmp strerror strnlen strpbrk strstr strtol \ strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr) @@ -2708,7 +2708,8 @@ ndb_transporter_opt_objs="" if test "$ac_cv_func_shmget" = "yes" && test "$ac_cv_func_shmat" = "yes" && test "$ac_cv_func_shmdt" = "yes" && - test "$ac_cv_func_shmctl" = "yes" + test "$ac_cv_func_shmctl" = "yes" && + test "$ac_cv_func_sigaction" = "yes" then AC_DEFINE([NDB_SHM_TRANSPORTER], [1], [Including Ndb Cluster DB shared memory transporter]) |