diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-26 11:37:48 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-26 11:37:48 -0700 |
| commit | 4a6a08309cd78091246a7fd598bc43cd25deba45 (patch) | |
| tree | 67d596918a2c844d7d873342caa754c39e526041 /scripts | |
| parent | 4ff6fd34dae6315384d8c38ea69092cde09b78ba (diff) | |
| parent | 072097174c8b91299fe74a3cd7c5248e6e3cfc57 (diff) | |
| download | mariadb-git-4a6a08309cd78091246a7fd598bc43cd25deba45.tar.gz | |
Merge 5.5 -> 5.5-mwl248.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 9 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 1dd6b787c43..0ed94d0ffa3 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -484,7 +484,8 @@ then echo "databases and anonymous user created by default. This is" echo "strongly recommended for production servers." echo - echo "See the MariaDB knowledge or the MySQL manual for more instructions." + echo "See the MariaDB Knowledgebase at http://kb.askmonty.org or the" + echo "MySQL manual for more instructions." if test "$in_rpm" -eq 0 then @@ -499,13 +500,13 @@ then echo echo "Please report any problems with the $scriptdir/mysqlbug script!" echo - echo "The latest information about MariaDB is available at http://www.askmonty.org/." + echo "The latest information about MariaDB is available at http://mariadb.org/." echo "You can find additional information about the MySQL part at:" echo "http://dev.mysql.com" echo "Support MariaDB development by buying support/new features from" - echo "Monty Program Ab. You can contact us about this at sales@askmonty.org". + echo "Monty Program Ab. You can contact us about this at sales@montyprogram.com". echo "Alternatively consider joining our community based development effort:" - echo "http://askmonty.org/wiki/index.php/MariaDB#How_can_I_participate_in_the_development_of_MariaDB" + echo "http://kb.askmonty.org/en/contributing-to-the-mariadb-project/" echo fi diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 02316d218e7..99ce187fcd4 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -116,7 +116,6 @@ sub main print "will be disabled\nand some will be enabled.\n\n"; } - init_log() if (!defined($opt_log)); $groupids = $ARGV[1]; if ($opt_version) { @@ -142,6 +141,7 @@ sub main !($ARGV[0] =~ m/^stop$/i) && !($ARGV[0] =~ m/^report$/i))); + init_log() if (!defined($opt_log)); if (!$opt_no_log) { w2log("$my_progname log file version $VER; run: ", |