database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

Browse Source 
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.
This commit is contained in:
unknown
2007-10-08 12:40:21 -04:00
parent 6b957bcba4 6f2c2dc8e8
commit 6859d8b8c7
14 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mysqld_safe.sh
View File

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