diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
| commit | 0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb (patch) | |
| tree | 5af5b81499f6137f45a37fc77cc518e40fd4ad72 /sql/mysqld.cc | |
| parent | e4df6e5799eec20a16e279f7e74e95f18cd475fe (diff) | |
| parent | e02fe87f00dc9fdb0fb6ab13f2e87485f79f3341 (diff) | |
| download | mariadb-git-0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 00ddaecd4b7..9d1ba6c66fd 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2008, 2014, SkySQL Ab. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. + Copyright (c) 2008, 2015, SkySQL 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 @@ -3607,6 +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()); + #ifndef EMBEDDED_LIBRARY if (opt_abort && !opt_verbose) unireg_abort(0); |