diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2005-10-31 09:22:26 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2005-10-31 09:22:26 +0000 |
commit | 32384a665379e27a38135a9b4b082b4fd1132a67 (patch) | |
tree | d5d0d86b40b0512acc5c9b2a406547b44d97750b /databases/mysql5-server/patches | |
parent | b807afcc11810b75909b187755e0907b8df416f3 (diff) | |
download | pkgsrc-32384a665379e27a38135a9b4b082b4fd1132a67.tar.gz |
Initial import of mysql5-server-5.0.15.
MySQL is a SQL (Structured Query Language) database server. SQL is the
most popular database language in the world. MySQL is a client-server
implementation that consists of a server daemon `mysqld' and many
different client programs/libraries.
The main goals of MySQL are speed and robustness.
The base upon which MySQL is built is a set of routines that have been
used in a highly demanding production environment for many years. While
MySQL is still in development it already offers a rich and highly useful
function set.
The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
This package contains the MySQL server programs and libraries.
Diffstat (limited to 'databases/mysql5-server/patches')
-rw-r--r-- | databases/mysql5-server/patches/patch-aa | 19 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ab | 32 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ac | 13 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ad | 22 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ae | 13 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-af | 33 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ag | 21 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ah | 21 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ai | 30 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-aj | 103 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ak | 20 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-al | 13 |
12 files changed, 340 insertions, 0 deletions
diff --git a/databases/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa new file mode 100644 index 00000000000..d4e1014363f --- /dev/null +++ b/databases/mysql5-server/patches/patch-aa @@ -0,0 +1,19 @@ +$NetBSD: patch-aa,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- Makefile.in.orig 2005-10-31 09:34:47.000000000 +0100 ++++ Makefile.in 2005-10-31 09:35:11.000000000 +0100 +@@ -359,12 +359,8 @@ + + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ +- @readline_topdir@ sql-common \ +- @thread_dirs@ pstack \ +- @sql_union_dirs@ scripts @man_dirs@ tests \ +- netware @libmysqld_dirs@ \ +- @bench_dirs@ support-files @tools_dirs@ ++SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \ ++ @bench_dirs@ support-files + + DIST_SUBDIRS = . include @docs_dirs@ zlib \ + @readline_topdir@ sql-common \ diff --git a/databases/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab new file mode 100644 index 00000000000..ffe8a4b2fd1 --- /dev/null +++ b/databases/mysql5-server/patches/patch-ab @@ -0,0 +1,32 @@ +$NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- tests/Makefile.in.orig 2005-10-31 09:35:35.000000000 +0100 ++++ tests/Makefile.in 2005-10-31 09:36:29.000000000 +0100 +@@ -100,7 +100,7 @@ + am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \ + $(am__objects_1) + mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS) +-am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la ++am__DEPENDENCIES_1 = + am__DEPENDENCIES_2 = + mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) +@@ -112,7 +112,7 @@ + thread_test_SOURCES = thread_test.c + thread_test_OBJECTS = thread_test.$(OBJEXT) + thread_test_LDADD = $(LDADD) +-thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la ++thread_test_DEPENDENCIES = + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -412,8 +412,7 @@ + INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ + $(openssl_includes) + +-LDADD = @CLIENT_EXTRA_LDFLAGS@ \ +- $(top_builddir)/libmysql/libmysqlclient.la ++LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient + + mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) + mysql_client_test_SOURCES = mysql_client_test.c $(yassl_dummy_link_fix) diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac new file mode 100644 index 00000000000..6fcfa2f4d47 --- /dev/null +++ b/databases/mysql5-server/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- mysql-test/Makefile.in.orig 2005-10-31 09:37:02.000000000 +0100 ++++ mysql-test/Makefile.in 2005-10-31 09:37:57.000000000 +0100 +@@ -379,7 +379,7 @@ + @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\" + @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\" + benchdir_root = $(prefix) +-testdir = $(benchdir_root)/mysql-test ++testdir = $(benchdir_root)/share/mysql-test + EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp + EXTRA_DIST = $(EXTRA_SCRIPTS) + test_SCRIPTS = mysql-test-run install_test_db diff --git a/databases/mysql5-server/patches/patch-ad b/databases/mysql5-server/patches/patch-ad new file mode 100644 index 00000000000..0f1603af9b9 --- /dev/null +++ b/databases/mysql5-server/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- sql/mysqld.cc.orig 2005-10-17 03:27:30.000000000 +0200 ++++ sql/mysqld.cc 2005-10-31 09:57:13.000000000 +0100 +@@ -171,7 +171,7 @@ + int initgroups(const char *,unsigned int); + #endif + +-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) ++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H) + #include <ieeefp.h> + #ifdef HAVE_FP_EXCEPT // Fix type conflict + typedef fp_except fp_except_t; +@@ -3276,7 +3276,7 @@ + init_ssl(); + + #ifdef HAVE_LIBWRAP +- libwrapName= my_progname+dirname_length(my_progname); ++ libwrapName= (char *)my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); + #endif + diff --git a/databases/mysql5-server/patches/patch-ae b/databases/mysql5-server/patches/patch-ae new file mode 100644 index 00000000000..7545d80c591 --- /dev/null +++ b/databases/mysql5-server/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- mysys/my_gethwaddr.c.orig 2005-10-14 10:21:10.000000000 +0000 ++++ mysys/my_gethwaddr.c +@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to + return res; + } + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + + #include <net/ethernet.h> + #include <sys/sysctl.h> diff --git a/databases/mysql5-server/patches/patch-af b/databases/mysql5-server/patches/patch-af new file mode 100644 index 00000000000..de1c806a75d --- /dev/null +++ b/databases/mysql5-server/patches/patch-af @@ -0,0 +1,33 @@ +$NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- configure.orig 2005-10-31 09:38:34.000000000 +0100 ++++ configure 2005-10-31 09:40:09.000000000 +0100 +@@ -21984,7 +21984,7 @@ + FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" + else + case $SYSTEM_TYPE in +- *freebsd*) ++ *freebsd* | *dragonfly*) + FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" + ;; + *darwin*) +@@ -26258,6 +26258,10 @@ + MAX_C_OPTIMIZE="-O" + fi + ;; ++ *dragonfly*) ++ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000" ++ ;; ++ + *freebsd*) + { echo "$as_me:$LINENO: WARNING: Adding fix for interrupted reads" >&5 + echo "$as_me: WARNING: Adding fix for interrupted reads" >&2;} +@@ -39729,7 +39733,7 @@ + main () + { + +- char res= *(*rl_completion_entry_function)(0,0); ++ char res= (*rl_completion_entry_function)(0,0); + completion_matches(0,0); + + ; diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag new file mode 100644 index 00000000000..61c8fa98317 --- /dev/null +++ b/databases/mysql5-server/patches/patch-ag @@ -0,0 +1,21 @@ +$NetBSD: patch-ag,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- include/Makefile.in.orig 2005-10-31 09:40:49.000000000 +0100 ++++ include/Makefile.in 2005-10-31 09:41:21.000000000 +0100 +@@ -338,14 +338,8 @@ + yassl_dir = @yassl_dir@ + yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@ + zlib_dir = @zlib_dir@ +-BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h +-pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ +- mysql.h mysql_com.h mysql_embed.h \ +- my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ +- errmsg.h my_global.h my_net.h my_alloc.h \ +- my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ +- sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ +- mysql_time.h $(BUILT_SOURCES) ++BUILT_SOURCES = ++pkginclude_HEADERS = + + noinst_HEADERS = config-win.h config-os2.h config-netware.h \ + heap.h my_bitmap.h\ diff --git a/databases/mysql5-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah new file mode 100644 index 00000000000..7532b670439 --- /dev/null +++ b/databases/mysql5-server/patches/patch-ah @@ -0,0 +1,21 @@ +$NetBSD: patch-ah,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- man/Makefile.in.orig 2005-10-31 09:41:52.000000000 +0100 ++++ man/Makefile.in 2005-10-31 09:42:12.000000000 +0100 +@@ -334,14 +334,8 @@ + yassl_dir = @yassl_dir@ + yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@ + zlib_dir = @zlib_dir@ +-man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \ +- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ +- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 +- +-EXTRA_DIST = mysql.1.in mysql_zap.1.in \ +- mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ +- mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \ +- mysqld_safe.1.in mysql_fix_privilege_tables.1.in ++man_MANS = mysqld.1 mysqld_multi.1 ++EXTRA_DIST = mysqld.1.in mysqld_multi.1.in + + CLEANFILES = $(man_MANS) + SUFFIXES = .in diff --git a/databases/mysql5-server/patches/patch-ai b/databases/mysql5-server/patches/patch-ai new file mode 100644 index 00000000000..82c7c4cdc5d --- /dev/null +++ b/databases/mysql5-server/patches/patch-ai @@ -0,0 +1,30 @@ +$NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- include/my_pthread.h.orig 2003-12-14 21:23:47.000000000 +0000 ++++ include/my_pthread.h 2003-12-20 12:09:31.000000000 +0000 +@@ -19,7 +19,13 @@ + #ifndef _my_pthread_h + #define _my_pthread_h + ++/* defines __NetBSD_Version__ */ ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#endif ++ + #include <errno.h> ++#include <signal.h> + #ifndef ETIME + #define ETIME ETIMEDOUT /* For FreeBSD */ + #endif +@@ -301,7 +307,11 @@ + #endif + + #ifndef HAVE_NONPOSIX_SIGWAIT ++#if defined (__NetBSD__) && (__NetBSD_Version__ < 106130000) ++#define my_sigwait(A,B) __pthread_sigwait((A),(B)) ++#else + #define my_sigwait(A,B) sigwait((A),(B)) ++#endif + #else + int my_sigwait(const sigset_t *set,int *sig); + #endif diff --git a/databases/mysql5-server/patches/patch-aj b/databases/mysql5-server/patches/patch-aj new file mode 100644 index 00000000000..579259e6fba --- /dev/null +++ b/databases/mysql5-server/patches/patch-aj @@ -0,0 +1,103 @@ +$NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- scripts/mysqld_safe.sh.orig 2005-01-17 15:16:35.000000000 +0100 ++++ scripts/mysqld_safe.sh 2005-01-17 15:20:03.000000000 +0100 +@@ -253,6 +253,14 @@ + fi + fi + ++datemsg() ++{ ++ echo -n $(date +'%y%M%d %H:%M:%S')" " ++ echo "$*" ++} ++ ++exec >>$err_log 2>&1 ++ + # + # If there exists an old pid file, check if the daemon is already running + # Note: The switches to 'ps' may depend on your operating system +@@ -263,18 +271,16 @@ + then + if @FIND_PROC@ + then # The pid contains a mysqld process +- echo "A mysqld process already exists" +- echo "A mysqld process already exists at " `date` >> $err_log ++ datemsg "A mysqld process already exists" + exit 1 + fi + fi + rm -f $pid_file + if test -f $pid_file + then +- echo "Fatal error: Can't remove the pid file: $pid_file" +- echo "Fatal error: Can't remove the pid file: $pid_file at " `date` >> $err_log +- echo "Please remove it manually and start $0 again" +- echo "mysqld daemon not started" ++ datemsg "Fatal error: Can't remove the pid file: $pid_file" ++ datemsg "Please remove it manually and start $0 again" ++ datemsg "mysqld daemon not started" + exit 1 + fi + fi +@@ -287,11 +293,11 @@ + # Alternatively, you can start mysqld with the "myisam-recover" option. See + # the manual for details. + # +-# echo "Checking tables in $DATADIR" ++# datemsg "Checking tables in $DATADIR" + # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI + # $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM + +-echo "Starting $MYSQLD daemon with databases from $DATADIR" ++datemsg "Starting $MYSQLD daemon with databases from $DATADIR" + + # Does this work on all systems? + #if type ulimit | grep "shell builtin" > /dev/null +@@ -299,7 +305,7 @@ + # ulimit -n 256 > /dev/null 2>&1 # Fix for BSD and FreeBSD systems + #fi + +-echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log ++datemsg "mysqld started" + while true + do + rm -f $safe_mysql_unix_port $pid_file # Some extra safety +@@ -311,7 +317,7 @@ + fi + if test ! -f $pid_file # This is removed if normal shutdown + then +- echo "STOPPING server from pid file $pid_file" ++ datemsg "STOPPING server from pid file $pid_file" + break + fi + +@@ -324,7 +330,7 @@ + # kill -9 is used or the process won't react on the kill. + numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"` + +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log ++ datemsg -e "\nNumber of processes running now: $numofproces" + I=1 + while test "$I" -le "$numofproces" + do +@@ -337,16 +343,14 @@ + # echo "TEST $I - $T **" + if kill -9 $T + then +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log ++ datemsg "$MYSQLD process hanging, pid $T - killed" + else + break + fi + I=`expr $I + 1` + done + fi +- echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log ++ datemsg "mysqld restarted" + done + +-echo "`date +'%y%m%d %H:%M:%S'` mysqld ended" | tee -a $err_log +-echo "" | tee -a $err_log +- ++datemsg "mysqld ended" diff --git a/databases/mysql5-server/patches/patch-ak b/databases/mysql5-server/patches/patch-ak new file mode 100644 index 00000000000..61a880cbaca --- /dev/null +++ b/databases/mysql5-server/patches/patch-ak @@ -0,0 +1,20 @@ +$NetBSD: patch-ak,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- support-files/Makefile.in.orig 2005-09-27 00:00:34.000000000 +0200 ++++ support-files/Makefile.in 2005-09-27 00:00:57.000000000 +0200 +@@ -345,14 +345,7 @@ + ndb-config-2-node.ini.sh + + SUBDIRS = MacOSX +-pkgdata_DATA = my-small.cnf \ +- my-medium.cnf \ +- my-large.cnf \ +- my-huge.cnf \ +- my-innodb-heavy-4G.cnf \ +- mysql-log-rotate \ +- binary-configure \ +- ndb-config-2-node.ini ++pkgdata_DATA = + + pkgdata_SCRIPTS = mysql.server + noinst_DATA = mysql-@VERSION@.spec \ diff --git a/databases/mysql5-server/patches/patch-al b/databases/mysql5-server/patches/patch-al new file mode 100644 index 00000000000..3f746525925 --- /dev/null +++ b/databases/mysql5-server/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ + +--- myisam/Makefile.in.orig 2005-01-10 16:19:12.000000000 +0100 ++++ myisam/Makefile.in 2005-01-10 16:19:21.000000000 +0100 +@@ -172,7 +172,7 @@ + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) ++CCLD = $(CXX) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \ |