database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.

Browse Source 
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
This commit is contained in:
Alexey Kopytov
2010-02-23 16:26:45 +03:00
parent 0afa209018 6f78ef71d4
commit f0d2fe34f2
35 changed files with 956 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysql_install_db.sh
View File

@ -410,8 +410,7 @@ else
echo "Try 'mysqld --help' if you have problems with paths. Using --log"
echo "gives you a log in $ldata that may be helpful."
echo
echo "The latest information about MySQL is available on the web at"
echo "http://www.mysql.com/. Please consult the MySQL manual section"
echo "Please consult the MySQL manual section"
echo "'Problems running mysql_install_db', and the manual section that"
echo "describes problems on your OS. Another information source are the"
echo "MySQL email archives available at http://lists.mysql.com/."
@ -470,9 +469,6 @@ then
echo
echo "Please report any problems with the $scriptdir/mysqlbug script!"
echo
echo "The latest information about MySQL is available at http://www.mysql.com/"
echo "Support MySQL by buying support/licenses from http://shop.mysql.com/"
echo
fi
exit 0