1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into ice.snake.net:/Users/paul/mysql-4.0
This commit is contained in:
paul@ice.snake.net 2003-10-04 17:42:43 -05:00
commit 2de4f6b12d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/mysql-test-run.sh
View File

@ -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

2
scripts/mysql_install_db.sh
View File

@ -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 !"

2
support-files/my-small.cnf.sh
View File

@ -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