diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-10-08 12:40:21 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-10-08 12:40:21 -0400 |
| commit | 6859d8b8c73ea323dc6fd2f381f9d228c33d93de (patch) | |
| tree | fb68c0de78382c33518e3a3a00c34603162650d4 /scripts/mysqld_safe.sh | |
| parent | 6b957bcba4b54168219c92152e2f7ab158db5c74 (diff) | |
| parent | 6f2c2dc8e804d5a5a80fae49d7fa98cc2c76639f (diff) | |
| download | mariadb-git-6859d8b8c73ea323dc6fd2f381f9d228c33d93de.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
netware/mysql_test_run.c:
Auto merged
sql/mysqld.cc:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
scripts/mysqld_safe.sh:
Manual merge.
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index d9c1a16e21a..99dcafbbf71 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -396,7 +396,7 @@ then does not exist or is not executable. Please cd to the mysql installation directory and restart this script from there as follows: ./bin/mysqld_safe& -See http://dev.mysql.com/doc/mysql/en/mysqld_safe.html for more information" +See http://dev.mysql.com/doc/mysql/en/mysqld-safe.html for more information" exit 1 fi |