Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions client/mysql.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1424,6 +1424,10 @@ int main(int argc,char *argv[])
mysql_thread_id(&mysql), server_version_string(&mysql));
put_info((char*) glob_buffer.ptr(),INFO_INFO);
put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
#if SERVER_MATURITY_LEVEL < MariaDB_PLUGIN_MATURITY_STABLE
puts("Help others discover MariaDB."
" Star it on GitHub: https://github.com/MariaDB/server\n");
#endif
}

#ifdef HAVE_READLINE
Expand Down
4 changes: 4 additions & 0 deletions mysql-test/main/mysql-interactive.result
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Your MariaDB connection id is X
Server version: Y
Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.

Help others discover MariaDB. Star it on GitHub: https://github.com/MariaDB/server

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

MariaDB [(none)]> delimiter $
Expand Down Expand Up @@ -40,6 +42,8 @@ Your MariaDB connection id is X
Server version: Y
Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.

Help others discover MariaDB. Star it on GitHub: https://github.com/MariaDB/server

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

MariaDB [(none)]> create database db1;
Expand Down
8 changes: 7 additions & 1 deletion sql/mysqld.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5049,11 +5049,17 @@ static int init_server_components()
Print source revision hash, as one of the first lines, if not the
first in error log, for troubleshooting and debugging purposes
*/
if (!opt_help)
if (!opt_help) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The brace should be on the new line.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vuvova fyi, I've fixed space, s/us/it/ and s/puts/sql_print_information/. I've also fixed the brace. What remains is whether to print it from the server. But I'm leaving this to you to decide.

sql_print_information("Starting MariaDB %s source revision %s "
"server_uid %s as process %lu",
server_version, SOURCE_REVISION, server_uid,
(ulong) getpid());
#if SERVER_MATURITY_LEVEL < MariaDB_PLUGIN_MATURITY_STABLE
sql_print_information("Help others discover MariaDB."
" Star it on GitHub: https://github.com/MariaDB/server");
#endif
}


#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
/*
Expand Down