Upgrade to 3.23.37.

This commit is contained in:
Dirk Froemberg 2001-04-21 11:26:11 +00:00
parent 5953389000
commit fe7ab376bb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=41757
54 changed files with 333 additions and 297 deletions

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= ${MASTERPORTNAME} PORTNAME?= ${MASTERPORTNAME}
PORTVERSION= 3.23.36 PORTVERSION= 3.23.37
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \

View file

@ -1 +1 @@
MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Sep 8 10:00:29 2000 --- Makefile.in.orig Wed Apr 18 10:54:42 2001
+++ Makefile.in Sat Sep 23 21:26:18 2000 +++ Makefile.in Sat Apr 21 13:00:23 2001
@@ -172,8 +172,12 @@ @@ -181,8 +181,12 @@
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
@ -9,8 +9,8 @@
+.if defined(CLIENT_ONLY) +.if defined(CLIENT_ONLY)
+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else +.else
+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
+.endif +.endif
# Relink after clean # Relink after clean
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

View file

@ -1,6 +1,6 @@
--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 --- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001
+++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001
@@ -64,30 +64,9 @@ @@ -73,30 +73,9 @@
done done
} }
@ -12,7 +12,7 @@
- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
- DATADIR=$MY_BASEDIR_VERSION/data - DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults" - if test -z "$defaults"
- then - then
- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" - defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
- fi - fi
@ -34,7 +34,7 @@
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
@@ -224,34 +203,6 @@ @@ -240,34 +219,6 @@
if test ! -f $pid_file # This is removed if normal shutdown if test ! -f $pid_file # This is removed if normal shutdown
then then
break break

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Dec 16 22:49:12 2000 --- configure.orig Thu Apr 19 15:18:13 2001
+++ configure Mon Dec 18 12:21:11 2000 +++ configure Thu Apr 19 15:22:18 2001
@@ -2950,7 +2950,7 @@ @@ -2983,7 +2983,7 @@
;; ;;
esac esac
fi fi
@ -9,9 +9,9 @@
if test -n "$HOSTNAME"; then if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6 echo "$ac_t""$HOSTNAME" 1>&6
else else
@@ -3078,35 +3078,7 @@ @@ -3117,38 +3117,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:3080: checking "how to check if pid exists"" >&5 echo "configure:3119: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS PS=$ac_cv_path_PS
-# Linux style -# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -38,6 +38,9 @@
- *darwin*) - *darwin*)
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;; - ;;
- *cygwin*)
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
- ;;
- *) - *)
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
- esac - esac
@ -46,7 +49,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6 echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -5793,7 +5765,6 @@ @@ -5911,7 +5880,6 @@
#define $ac_tr_lib 1 #define $ac_tr_lib 1
EOF EOF
@ -54,7 +57,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -6017,28 +5988,6 @@ @@ -6143,28 +6111,6 @@
fi fi
@ -83,7 +86,7 @@
# Check whether --with-debug or --without-debug was given. # Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then if test "${with_debug+set}" = set; then
withval="$with_debug" withval="$with_debug"
@@ -6719,10 +6668,6 @@ @@ -6845,10 +6791,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
@ -93,37 +96,37 @@
-fi -fi
mysql_cv_btype_last_arg_accept=none mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6729 "configure" #line 6855 "configure"
@@ -8736,10 +8681,6 @@ @@ -8924,10 +8866,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' #do not treat warnings as errors if we are linking agaist other libc
cross_compiling=$ac_cv_prog_cxx_cross #this is to work around gcc not being permissive on non-system includes
#with respect to ANSI C++
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8745 "configure" #line 8933 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8804,10 +8745,6 @@ @@ -8992,10 +8930,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8813 "configure" #line 9001 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -8871,10 +8808,6 @@ @@ -9059,10 +8993,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
-if test "$ac_cv_prog_gxx" = "yes" -if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
-then -then
- CXXFLAGS="$CXXFLAGS -Werror" - CXXFLAGS="$CXXFLAGS -Werror"
-fi -fi
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8880 "configure" #line 9068 "configure"
#include "confdefs.h" #include "confdefs.h"

View file

@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
share/mysql/my-small.cnf share/mysql/my-small.cnf
share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate share/mysql/mysql-log-rotate
share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
share/mysql/mysql.server share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.sys
share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian-ny/errmsg.txt