summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <paul@ice.snake.net>2003-10-04 17:42:43 -0500
committerunknown <paul@ice.snake.net>2003-10-04 17:42:43 -0500
commitb2fd8218168925cec6c623e855fc3c1d58df5ce9 (patch)
treea2c860a8ff03186d71804599e9daf822e76aa24e /mysql-test
parent179700e3f31f9dbd1d6513baf10466c867e88599 (diff)
parenta0e2753e876c80912aa65fd9c2dfc30357b1581f (diff)
downloadmariadb-git-b2fd8218168925cec6c623e855fc3c1d58df5ce9.tar.gz
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into ice.snake.net:/Users/paul/mysql-4.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 93efb4a8cb6..b452023dcb9 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1041,8 +1041,8 @@ EOF
mysql_start ()
{
-# We should not start the deamon here as we don't know the argumens
-# for the test. Better to let the test start the deamon
+# We should not start the daemon here as we don't know the argumens
+# for the test. Better to let the test start the daemon
# $ECHO "Starting MySQL daemon"
# start_master
@@ -1364,7 +1364,7 @@ then
mysql_install_db
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
if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ]
then