diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 15:28:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 15:28:07 +0100 |
| commit | 0dc23679c867629ded5f9534d2ab6e8edf238aa0 (patch) | |
| tree | 9cf966507fa2ef0fd17932b600d051df5f7bd2e5 /scripts/mysql_install_db.sh | |
| parent | 6efa5efa7dd112b6ac2efdd84235a13cca51c4d4 (diff) | |
| parent | 0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (diff) | |
| download | mariadb-git-0dc23679c867629ded5f9534d2ab6e8edf238aa0.tar.gz | |
10.0-base merge
Diffstat (limited to 'scripts/mysql_install_db.sh')
| -rw-r--r-- | scripts/mysql_install_db.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 3ae8d681b08..c24aacaf883 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. -# Copyright (c) 2009, 2011,2013 Monty Program Ab +# Copyright (c) 2000, 2013, Oracle and/or its affiliates. +# Copyright (c) 2009, 2013, Monty Program Ab # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -267,7 +267,7 @@ then bindir="$basedir/client" extra_bindir="$basedir/extra" mysqld="$basedir/sql/mysqld" - langdir="$srcdir/sql/share/english" + langdir="$basedir/sql/share/english" pkgdatadir="$srcdir/scripts" scriptdir="$srcdir/scripts" elif test -n "$basedir" @@ -435,7 +435,7 @@ else echo "The problem could be conflicting information in an external" echo "my.cnf files. You can ignore these by doing:" echo - echo " shell> /scripts/mysql_install_db --defaults-file=~/.my.cnf" + echo " shell> $scriptdir/scripts/mysql_install_db --defaults-file=~/.my.cnf" echo echo "You can also try to start the mysqld daemon with:" echo @@ -453,8 +453,9 @@ else echo "MariaDB is hosted on launchpad; You can find the latest source and" echo "email lists at http://launchpad.net/maria" echo - echo "Please check all of the above before mailing us! And remember, if" - echo "you do mail us, you should use the $scriptdir/mysqlbug script!" + echo "Please check all of the above before submitting a bug report" + echo "at http://mariadb.org/jira" + echo exit 1 fi @@ -505,7 +506,7 @@ then fi echo - echo "Please report any problems with the '$scriptdir/mysqlbug' script!" + echo "Please report any problems at http://mariadb.org/jira" echo echo "The latest information about MariaDB is available at http://mariadb.org/." echo "You can find additional information about the MySQL part at:" |