upgrade to MySQL 3.22.30
This commit is contained in:
brad
parent
1b5be17619
commit
72452bb507
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2000/01/05 06:13:43 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2000/01/13 20:24:57 brad Exp $
|
||||
# $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $
|
||||
|
||||
DISTNAME= mysql-3.22.29
|
||||
DISTNAME= mysql-3.22.30
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= http://www.mysql.org/Downloads/MySQL-3.22/ \
|
||||
http://web.tryc.on.ca/mysql/Downloads/MySQL-3.22/ \
|
||||
MASTER_SITES= http://web.tryc.on.ca/mysql/Downloads/MySQL-3.22/ \
|
||||
http://mysql.he.net/Downloads/MySQL-3.22/ \
|
||||
http://www.buoy.com/mysql/Downloads/MySQL-3.22/ \
|
||||
ftp://ftp.netcasting.net/pub/mysql/Downloads/MySQL-3.22/ \
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (mysql-3.22.29.tar.gz) = d567b6f1ac63bb7b18281a3350f2b36e
|
||||
RMD160 (mysql-3.22.29.tar.gz) = 136e351237bd511f4dceed36e00c12e8fc7be187
|
||||
SHA1 (mysql-3.22.29.tar.gz) = 2b7e4190aafa7c7eca6e7d1e77dcce342cfe9f3b
|
||||
MD5 (mysql-3.22.30.tar.gz) = 26d0ba5f19e4d93ba81611cbe35da81a
|
||||
RMD160 (mysql-3.22.30.tar.gz) = 447de83af48609321067986ae7b8ff0326473340
|
||||
SHA1 (mysql-3.22.30.tar.gz) = db71e5ab7932a48c840c958cc60af52ec882bfed
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
--- sql/sql_parse.cc.orig Tue Jan 11 17:55:26 2000
|
||||
+++ sql/sql_parse.cc Tue Jan 11 18:05:46 2000
|
||||
@@ -1102,6 +1102,25 @@
|
||||
tables ? &tables->grant.privilege : 0,
|
||||
tables ? 0 : 1))
|
||||
goto error;
|
||||
+
|
||||
+ /* Check that the user isn't trying to change a password for another
|
||||
+ user if he doesn't have UPDATE privilege to the MySQL database */
|
||||
+
|
||||
+ List_iterator <LEX_USER> user_list(lex->users_list);
|
||||
+ LEX_USER *user;
|
||||
+ while ((user=user_list++))
|
||||
+ {
|
||||
+ if (user->password.str &&
|
||||
+ (strcmp(thd->user,user->user.str) ||
|
||||
+ user->host.str && my_strcasecmp(user->host.str,
|
||||
+ thd->host ? thd->host : thd->ip)))
|
||||
+ {
|
||||
+ if (check_access(thd, UPDATE_ACL, "mysql",0,1))
|
||||
+ goto error;
|
||||
+ break; // We are allowed to do changes
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if (tables)
|
||||
{
|
||||
if (grant_option && check_grant(thd,
|
||||
@ -1,5 +1,5 @@
|
||||
--- scripts/safe_mysqld.sh.orig Sun Dec 19 01:26:59 1999
|
||||
+++ scripts/safe_mysqld.sh Sun Dec 19 01:29:21 1999
|
||||
--- scripts/safe_mysqld.sh.orig Mon Jan 10 16:49:29 2000
|
||||
+++ scripts/safe_mysqld.sh Thu Jan 13 13:17:12 2000
|
||||
@@ -12,33 +12,9 @@
|
||||
|
||||
trap '' 1 2 3 15 # we shouldn't let anyone kill us
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
pid_file=$DATADIR/`@HOSTNAME@`.pid
|
||||
log=$DATADIR/`@HOSTNAME@`.log
|
||||
@@ -117,33 +93,6 @@
|
||||
@@ -124,33 +100,6 @@
|
||||
if test ! -f $pid_file # This is removed if normal shutdown
|
||||
then
|
||||
break;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- configure.orig Sat Jan 1 11:33:47 2000
|
||||
+++ configure Tue Jan 4 12:42:57 2000
|
||||
@@ -2740,7 +2740,7 @@
|
||||
--- configure.orig Tue Jan 11 22:32:17 2000
|
||||
+++ configure Thu Jan 13 13:22:15 2000
|
||||
@@ -2743,7 +2743,7 @@
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -9,9 +9,9 @@
|
||||
if test -n "$HOSTNAME"; then
|
||||
echo "$ac_t""$HOSTNAME" 1>&6
|
||||
else
|
||||
@@ -2868,30 +2868,7 @@
|
||||
@@ -2871,29 +2871,7 @@
|
||||
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
|
||||
echo "configure:2870: checking "how to check if pid exists"" >&5
|
||||
echo "configure:2873: checking "how to check if pid exists"" >&5
|
||||
PS=$ac_cv_path_PS
|
||||
-# Linux style
|
||||
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null
|
||||
@ -36,12 +36,11 @@
|
||||
-else
|
||||
- { 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; }
|
||||
-fi
|
||||
-
|
||||
+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
|
||||
|
||||
echo "$ac_t"""$FIND_PROC"" 1>&6
|
||||
|
||||
# Check if a pid is valid
|
||||
@@ -4605,8 +4582,6 @@
|
||||
@@ -4614,8 +4592,6 @@
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
@ -50,7 +49,7 @@
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
@@ -4840,28 +4815,6 @@
|
||||
@@ -4849,28 +4825,6 @@
|
||||
fi
|
||||
|
||||
|
||||
@ -79,12 +78,3 @@
|
||||
# Check whether --with-debug or --without-debug was given.
|
||||
if test "${with_debug+set}" = set; then
|
||||
withval="$with_debug"
|
||||
@@ -7964,7 +7917,7 @@
|
||||
#include <pthread.h>
|
||||
int main() {
|
||||
pthread_attr_t thr_attr;
|
||||
-ptread_attr_setscope(&thr_attr,0);
|
||||
+pthread_attr_setscope(&thr_attr,0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
|
||||
@ -121,7 +121,7 @@ share/mysql/korean/errmsg.sys
|
||||
share/mysql/korean/errmsg.txt
|
||||
share/mysql/make_binary_distribution
|
||||
share/mysql/my-example.cnf
|
||||
share/mysql/mysql-3.22.29.spec
|
||||
share/mysql/mysql-3.22.30.spec
|
||||
share/mysql/mysql-log-rotate
|
||||
share/mysql/mysql.server
|
||||
share/mysql/norwegian-ny/errmsg.sys
|
||||
|
||||
@ -119,7 +119,7 @@ share/mysql/korean/errmsg.sys
|
||||
share/mysql/korean/errmsg.txt
|
||||
share/mysql/make_binary_distribution
|
||||
share/mysql/my-example.cnf
|
||||
share/mysql/mysql-3.22.29.spec
|
||||
share/mysql/mysql-3.22.30.spec
|
||||
share/mysql/mysql-log-rotate
|
||||
share/mysql/mysql.server
|
||||
share/mysql/norwegian-ny/errmsg.sys
|
||||
|
||||
Loading…
Reference in New Issue
Block a user