Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into ice.snake.net:/Users/paul/mysql-4.0
This commit is contained in:
commit
2de4f6b12d
@ -1041,8 +1041,8 @@ EOF
|
|||||||
|
|
||||||
mysql_start ()
|
mysql_start ()
|
||||||
{
|
{
|
||||||
# We should not start the deamon here as we don't know the argumens
|
# We should not start the daemon here as we don't know the argumens
|
||||||
# for the test. Better to let the test start the deamon
|
# for the test. Better to let the test start the daemon
|
||||||
|
|
||||||
# $ECHO "Starting MySQL daemon"
|
# $ECHO "Starting MySQL daemon"
|
||||||
# start_master
|
# start_master
|
||||||
@ -1364,7 +1364,7 @@ then
|
|||||||
mysql_install_db
|
mysql_install_db
|
||||||
start_manager
|
start_manager
|
||||||
|
|
||||||
# Do not automagically start deamons if we are in gdb or running only one test
|
# Do not automagically start daemons if we are in gdb or running only one test
|
||||||
# case
|
# case
|
||||||
if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ]
|
if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ]
|
||||||
then
|
then
|
||||||
|
@ -129,7 +129,7 @@ then
|
|||||||
fi
|
fi
|
||||||
echo "WARNING: The host '$hostname' could not be looked up with resolveip."
|
echo "WARNING: The host '$hostname' could not be looked up with resolveip."
|
||||||
echo "This probably means that your libc libraries are not 100 % compatible"
|
echo "This probably means that your libc libraries are not 100 % compatible"
|
||||||
echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
|
echo "with this binary MySQL version. The MySQL daemon, mysqld, should work"
|
||||||
echo "normally with the exception that host name resolving will not work."
|
echo "normally with the exception that host name resolving will not work."
|
||||||
echo "This means that you should use IP addresses instead of hostnames"
|
echo "This means that you should use IP addresses instead of hostnames"
|
||||||
echo "when specifying MySQL privileges !"
|
echo "when specifying MySQL privileges !"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Example mysql config file for small systems.
|
# Example mysql config file for small systems.
|
||||||
#
|
#
|
||||||
# This is for a system with little memory (<= 64M) where MySQL is only used
|
# This is for a system with little memory (<= 64M) where MySQL is only used
|
||||||
# from time to time and it's important that the mysqld deamon
|
# from time to time and it's important that the mysqld daemon
|
||||||
# doesn't use much resources.
|
# doesn't use much resources.
|
||||||
#
|
#
|
||||||
# You can copy this file to
|
# You can copy this file to
|
||||||
|
Loading…
x
Reference in New Issue
Block a user