You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
95 lines
3.3 KiB
95 lines
3.3 KiB
23 years ago
|
--- sql/mini_client.cc.dist Tue Mar 18 12:10:58 2003
|
||
|
|
+++ sql/mini_client.cc Tue Mar 18 12:11:17 2003
|
||
|
|
@@ -318,7 +318,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
s_err=0;
|
||
|
|
- if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, &s_err_size) != 0)
|
||
|
|
+ if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, (socklen_t *)&s_err_size) != 0)
|
||
|
|
return(-1);
|
||
|
|
|
||
|
|
if (s_err)
|
||
|
|
--- sql/mysqld.cc.dist Tue Mar 18 12:10:58 2003
|
||
|
|
+++ sql/mysqld.cc Tue Mar 18 12:11:18 2003
|
||
|
|
@@ -2476,7 +2476,7 @@
|
||
|
|
{
|
||
|
|
size_socket length=sizeof(struct sockaddr_in);
|
||
|
|
new_sock = accept(sock, my_reinterpret_cast(struct sockaddr *) (&cAddr),
|
||
|
|
- &length);
|
||
|
|
+ (socklen_t *)&length);
|
||
|
|
if (new_sock != INVALID_SOCKET ||
|
||
|
|
(socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN))
|
||
|
|
break;
|
||
|
|
@@ -2542,7 +2542,7 @@
|
||
|
|
size_socket dummyLen;
|
||
|
|
struct sockaddr dummy;
|
||
|
|
dummyLen = sizeof(struct sockaddr);
|
||
|
|
- if (getsockname(new_sock,&dummy, &dummyLen) < 0)
|
||
|
|
+ if (getsockname(new_sock,&dummy, (socklen_t *)&dummyLen) < 0)
|
||
|
|
{
|
||
|
|
sql_perror("Error on new connection socket");
|
||
|
|
(void) shutdown(new_sock,2);
|
||
|
|
--- scripts/mysql_install_db.sh.dist Tue Mar 18 12:10:58 2003
|
||
|
|
+++ scripts/mysql_install_db.sh Tue Mar 18 12:11:18 2003
|
||
|
|
@@ -133,14 +133,13 @@
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
|
||
|
|
-# Create database directories mysql & test
|
||
|
|
+# Create database directories mysql
|
||
|
|
if test "$IN_RPM" -eq 0
|
||
|
|
then
|
||
|
|
if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
|
||
|
|
if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700 $ldata/mysql ; fi
|
||
|
|
- if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test ; fi
|
||
|
|
if test -w / -a ! -z "$user"; then
|
||
|
|
- chown $user $ldata $ldata/mysql $ldata/test;
|
||
|
|
+ chown $user $ldata $ldata/mysql
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
|
||
|
|
@@ -176,8 +175,6 @@
|
||
|
|
c_d="$c_d )"
|
||
|
|
c_d="$c_d comment='Database privileges';"
|
||
|
|
|
||
|
|
- i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');
|
||
|
|
- INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');"
|
||
|
|
fi
|
||
|
|
|
||
|
|
if test ! -f $mdata/host.frm
|
||
|
|
@@ -232,10 +229,8 @@
|
||
|
|
INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
|
||
|
|
|
||
|
|
REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
|
||
|
|
- REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
|
||
|
|
+ REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');"
|
||
|
|
|
||
|
|
- INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
|
||
|
|
- INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');"
|
||
|
|
fi
|
||
|
|
|
||
|
|
if test ! -f $mdata/func.frm
|
||
|
|
@@ -333,10 +328,8 @@
|
||
|
|
if test "$IN_RPM" -eq 0
|
||
|
|
then
|
||
|
|
echo "You can start the MySQL daemon with:"
|
||
|
|
- echo "cd @prefix@ ; $bindir/safe_mysqld &"
|
||
|
|
+ echo "@l_prefix@/etc/rc mysql start"
|
||
|
|
echo
|
||
|
|
- echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
|
||
|
|
- echo "cd sql-bench ; run-all-tests"
|
||
|
|
echo
|
||
|
|
fi
|
||
|
|
echo "Please report any problems with the @scriptdir@/mysqlbug script!"
|
||
|
|
--- mysys/default.c.dist Tue Mar 18 12:10:58 2003
|
||
|
|
+++ mysys/default.c Tue Mar 18 12:11:18 2003
|
||
|
|
@@ -49,7 +49,7 @@
|
||
|
|
#ifdef __WIN__
|
||
|
|
"C:/",
|
||
|
|
#else
|
||
|
|
-"/etc/",
|
||
|
|
+"@l_prefix@/etc/mysql/",
|
||
|
|
#endif
|
||
|
|
#ifdef DATADIR
|
||
|
|
DATADIR,
|