diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 13:57:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 13:57:21 +0200 |
| commit | fbab0685a7b7f39db0217823ad90dd47034eae29 (patch) | |
| tree | 11baae52acdb6c3300d8fe37eb804920ac172960 /sql/mysqld.cc | |
| parent | 67a3ddf17abfd182b99e16cc539dc72be5da707b (diff) | |
| download | mariadb-git-fbab0685a7b7f39db0217823ad90dd47034eae29.tar.gz | |
post-merge changes, fixes, and tests
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9d1ba6c66fd..b3c33c2e46a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3607,8 +3607,9 @@ static int init_common_variables() return 1; set_server_version(); - sql_print_information("%s (mysqld %s) starting as process %lu ...", - my_progname, server_version, (ulong) getpid()); + if (!opt_help) + sql_print_information("%s (mysqld %s) starting as process %lu ...", + my_progname, server_version, (ulong) getpid()); #ifndef EMBEDDED_LIBRARY if (opt_abort && !opt_verbose) |