diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-23 20:49:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-23 20:49:31 +0200 |
| commit | c93405b7153df01362f9869bac7c2e305dd06af9 (patch) | |
| tree | 8043dec44994d714d28873d30d15e81ef3f040e7 /scripts | |
| parent | be21a113da9748d06739b6522ea898257970b1c5 (diff) | |
| parent | 8637931f118b53ff6fdadf6006ccdb8dedd6f732 (diff) | |
| download | mariadb-git-10.0-merge.tar.gz | |
WIP Merge 5.5 into bb-10.0-vicentiu10.0-merge
Unresolved conflicts:
both modified: sql/item_cmpfunc.cc
both modified: sql/item_cmpfunc.h
both modified: sql/sql_partition.cc
both modified: storage/tokudb/CMakeLists.txt
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 7643a747459..d04a6f497da 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -449,7 +449,7 @@ else echo echo "You can also try to start the mysqld daemon with:" echo - echo " shell> $mysqld --skip-grant --general-log &" + echo " shell> $mysqld --skip-grant-tables --general-log &" echo echo "and use the command line tool $bindir/mysql" echo "to connect to the mysql database and look at the grant tables:" @@ -460,8 +460,8 @@ else 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 "MariaDB is hosted on launchpad; You can find the latest source and" - echo "email lists at http://launchpad.net/maria" + echo "You can find the latest source at https://downloads.mariadb.org and" + echo "the maria-discuss email list at https://launchpad.net/~maria-discuss" echo echo "Please check all of the above before submitting a bug report" echo "at http://mariadb.org/jira" |