Hello In case this patch wasn't post here. bye, -christian-
Package: mysql Version: 3.23.33-1 Severity: important Tags: patch Below is a patch against mysql 3.23.31 (but applies well to 3.23.33-1) for things to work properly on Alpha. I've been applying this diff against most of the mysql's compiled to date and it seems to work very well. It should also handle the changes in the db3 code regarding Alpha/gcc mutex support. diff -ruN mysql-3.23.31/debian/db-3.2.3h/dist/aclocal/mutex.m4 mysql-patched/debian/db-3.2.3h/dist/aclocal/mutex.m4 --- mysql-3.23.31/debian/db-3.2.3h/dist/aclocal/mutex.m4 Sun Feb 4 20:36:44 2001 +++ mysql-patched/debian/db-3.2.3h/dist/aclocal/mutex.m4 Sun Feb 4 13:43:38 +2001 @@ -241,7 +241,7 @@ dnl Alpha/gcc: OSF/1 dnl The alpha/gcc code doesn't work as far as I know. There are dnl two versions, both have problems. See Support Request #1583. -if test "$db_cv_mutex" = DOESNT_WORK; then +if test "$db_cv_mutex" = no; then AC_TRY_RUN([main(){ #if defined(__alpha) #if defined(__GNUC__) diff -ruN mysql-3.23.31/debian/db-3.2.3h/dist/configure mysql-patched/debian/db-3.2.3h/dist/configure --- mysql-3.23.31/debian/db-3.2.3h/dist/configure Sun Feb 4 20:36:44 2001 +++ mysql-patched/debian/db-3.2.3h/dist/configure Sun Feb 4 13:43:55 2001 @@ -4058,7 +4058,7 @@ rm -f conftest* fi -if test "$db_cv_mutex" = DOESNT_WORK; then +if test "$db_cv_mutex" = no; then if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else diff -ruN mysql-3.23.31/include/global.h mysql-patched/include/global.h --- mysql-3.23.31/include/global.h Wed Jan 17 04:39:52 2001 +++ mysql-patched/include/global.h Sun Feb 4 13:44:08 2001 @@ -120,7 +120,7 @@ #endif /* In Linux-alpha we have atomic.h if we are using gcc */ -#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD) +#if defined(HAVE_LINUXTHREADS) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ < 2) && +defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 && +__GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD) #define HAVE_ATOMIC_ADD #define HAVE_ATOMIC_SUB #endif diff -ruN mysql-3.23.31/include/my_global.h mysql-patched/include/my_global.h --- mysql-3.23.31/include/my_global.h Wed Jan 17 04:41:11 2001 +++ mysql-patched/include/my_global.h Sun Feb 4 13:44:08 2001 @@ -115,7 +115,7 @@ #endif /* egcs 1.1.2 has a problem with memcpy on Alpha */ -#if defined(__GNUC__) && defined(__alpha__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) +#if defined(__GNUC__) && defined(__alpha__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ < +2) && ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) #define BAD_MEMCPY #endif diff -ruN mysql-3.23.31/sql/ha_berkeley.cc mysql-patched/sql/ha_berkeley.cc --- mysql-3.23.31/sql/ha_berkeley.cc Wed Jan 17 04:39:50 2001 +++ mysql-patched/sql/ha_berkeley.cc Sun Feb 4 20:36:17 2001 @@ -247,9 +247,9 @@ my_pthread_setspecific_ptr(THR_MALLOC,&show_logs_root); if ((error= log_archive(db_env, &all_logs, DB_ARCH_ABS | DB_ARCH_LOG, - (void* (*)(unsigned int)) sql_alloc)) || + (void* (*)(long unsigned int)) sql_alloc)) || (error= log_archive(db_env, &free_logs, DB_ARCH_ABS, - (void* (*)(unsigned int)) sql_alloc))) + (void* (*)(long unsigned int)) sql_alloc))) { DBUG_PRINT("error", ("log_archive failed (error %d)", error)); db_env->err(db_env, error, "log_archive: DB_ARCH_ABS");
--------------------------------------------------------------------- Before posting, please check: http://www.mysql.com/manual.php (the manual) http://lists.mysql.com/ (the list archive) To request this thread, e-mail <[EMAIL PROTECTED]> To unsubscribe, e-mail <[EMAIL PROTECTED]> Trouble unsubscribing? Try: http://lists.mysql.com/php/unsubscribe.php
