diff options
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | acinclude.m4 | 19 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | mysys/my_pthread.c | 2 | ||||
| -rwxr-xr-x | scripts/make_binary_distribution.sh | 2 | ||||
| -rwxr-xr-x | sql-bench/compare-results.sh | 13 | ||||
| -rw-r--r-- | sql/table.cc | 1 |
8 files changed, 30 insertions, 16 deletions
diff --git a/acconfig.h b/acconfig.h index 4e19b1c0802..09807392b30 100644 --- a/acconfig.h +++ b/acconfig.h @@ -50,6 +50,9 @@ /* READLINE: */ #undef HAVE_BSD_SIGNALS +/* ZLIB and compress: */ +#undef HAVE_COMPRESS + /* Define if we are using OSF1 DEC threads */ #undef HAVE_DEC_THREADS diff --git a/acinclude.m4 b/acinclude.m4 index 4ed69bda027..a5fa77b24cc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -116,6 +116,25 @@ then fi ]) +AC_DEFUN(MYSQL_CHECK_ZLIB_WITH_COMPRESS, [ +save_LIBS="$LIBS" +LIBS="-l$1 $LIBS" +AC_CACHE_CHECK([if libz with compress], mysql_cv_compress, +[AC_TRY_LINK([#include <zlib.h> +#ifdef __cplusplus +extern "C" +#endif +], +[ return compress(0, (unsigned long*) 0, "", 0); +], mysql_cv_compress=yes, mysql_cv_compress=no)]) +if test "$mysql_cv_compress" = "yes" +then + AC_DEFINE(HAVE_COMPRESS) +else + LIBS="$save_LIBS" +fi +]) + #---START: Used in for client configure AC_DEFUN(MYSQL_CHECK_ULONG, [AC_MSG_CHECKING(for type ulong) diff --git a/configure.in b/configure.in index d42f792d7a0..6ee9d249a3f 100644 --- a/configure.in +++ b/configure.in @@ -535,7 +535,7 @@ AC_CHECK_LIB(bind, bind) # For crypt() on Linux AC_CHECK_LIB(crypt,crypt) # For compress in zlib -AC_CHECK_LIB($with_named_zlib,compress) +MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib) if test "$IS_LINUX" = "true"; then AC_MSG_CHECKING([for atomic operations]) @@ -1217,7 +1217,7 @@ AC_CHECK_FUNCS(alarm bmove \ pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \ pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \ pthread_condattr_create rwlock_init pthread_rwlock_rdlock \ - crypt compress dlopen dlerror fchmod getpass getpassphrase initgroups) + crypt dlopen dlerror fchmod getpass getpassphrase initgroups) # Sanity check: We chould not have any fseeko symbol unless # large_file_support=yes diff --git a/include/my_pthread.h b/include/my_pthread.h index 2a77624b233..bf6a0515ed2 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -290,7 +290,7 @@ int sigwait(const sigset_t *set, int *sig); #ifndef HAVE_NONPOSIX_SIGWAIT #define my_sigwait(A,B) sigwait((A),(B)) #else -int my_sigwait(sigset_t *set,int *sig); +int my_sigwait(const sigset_t *set,int *sig); #endif #ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index b2445bfa363..3d8b2e4d0ed 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -102,7 +102,7 @@ int my_pthread_create_detached=1; int my_sigwait(const sigset_t *set,int *sig) { - int signal=sigwait(set); + int signal=sigwait((sigset_t*) set); if (signal < 0) return errno; *sig=signal; diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index a68df18c41a..8318ae3d696 100755 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -54,7 +54,7 @@ cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/ cp -p scripts/* $BASE/bin rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh -$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@prefix\@ . < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db +$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/safe_mysqld diff --git a/sql-bench/compare-results.sh b/sql-bench/compare-results.sh index fa1715d1928..d8a358ed171 100755 --- a/sql-bench/compare-results.sh +++ b/sql-bench/compare-results.sh @@ -301,7 +301,7 @@ EOF sub html_output { my $template="template.html"; - my $title="MySQL Benchmark Results - Compare with $opt_cmp"; + my $title="MySQL | | Information | Benchmarks | Compare with $opt_cmp"; my $image="info.gif"; $bar=""; @@ -318,18 +318,11 @@ sub html_output s|TITLE:SUBTITLE|$title|; print $_; } - elsif (m|/images/.gif|) + elsif (/TITLE:COMPARE/) { - s|/images/.gif|/images/$image|; - s|alt=""|alt="$title"|; + s|TITLE:COMPARE|$opt_cmp|; print $_; } - # Find line to inactivate - elsif (m|<img src="/images/${text}1.gif" border="0" width="66" height="20" alt="$text">|) - { - # Print inactive thing - print '<td align="center" bgcolor="#310063"><img src="/images/zero.gif" border="0" width="66" height="20" alt=""></td>'; - } elsif (/ subchapter name /) { # Nothing here for now diff --git a/sql/table.cc b/sql/table.cc index 82ad1f13606..5917244a4f3 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -543,7 +543,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, (void) outparam->file->close(); err_not_open: x_free((gptr) disk_buff); - delete crypted; VOID(my_close(file,MYF(MY_WME))); err_end: /* Here when no file */ |