mariadb-install-db: use mariadb names

Also refer to the service file for startup.

scripts/mysql_install_db.sh

@@ -593,17 +593,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/mysql"
+  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"
@@ -621,8 +621,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
@@ -631,7 +631,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"
@@ -655,10 +655,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