database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch 10.5 into 10.6

Browse Source
This commit is contained in:
Daniel Black
2022-12-15 09:32:54 +11:00
parent 4b2e7616f8 0f351b620a
commit 7df06dcbc3
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/mysql_install_db.sh
View File

@@ -594,17 +594,17 @@ else
echo
echo " shell> $0 --defaults-file=~/.my.cnf"
echo
echo "You can also try to start the mysqld daemon with:"
echo "You can also try to start the mariadbd daemon with:"
echo
echo " shell> $mysqld --skip-grant-tables --general-log &"
echo
echo "and use the command line tool $bindir/mariadb"
echo "to connect to the mysql database and look at the grant tables:"
echo
echo " shell> $bindir/mysql -u root mysql"
echo " mysql> show tables;"
echo " shell> $bindir/mariadb -u root mysql"
echo " MariaDB> show tables;"
echo
echo "Try 'mysqld --help' if you have problems with paths. Using"
echo "Try '$mysqld --help' if you have problems with paths. Using"
echo "--general-log gives you a log in $ldata that may be helpful."
link_to_help
echo "You can find the latest source at https://downloads.mariadb.org and"
@@ -622,8 +622,8 @@ fi
if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
then
s_echo
s_echo "To start mysqld at boot time you have to copy"
s_echo "support-files/mysql.server to the right place for your system"
s_echo "To start mariadbd at boot time you have to copy"
s_echo "support-files/mariadb.service to the right place for your system"
if test "$auth_root_authentication_method" = normal
then
@@ -632,7 +632,7 @@ then
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !"
echo "To do so, start the server, then issue the following command:"
echo
echo "'$bindir/mysql_secure_installation'"
echo "'$bindir/mariadb-secure-installation'"
echo
echo "which will also give you the option of removing the test"
echo "databases and anonymous user created by default. This is"
@@ -656,10 +656,10 @@ then
then
echo
echo "You can start the MariaDB daemon with:"
echo "cd '$basedir' ; $bindir/mysqld_safe --datadir='$ldata'"
echo "cd '$basedir' ; $bindir/mariadb-safe --datadir='$ldata'"
echo
echo "You can test the MariaDB daemon with mysql-test-run.pl"
echo "cd '$basedir/mysql-test' ; perl mysql-test-run.pl"
echo "cd '$basedir/@INSTALL_MYSQLTESTDIR@' ; perl mariadb-test-run.pl"
fi
echo