summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index a13617cc9cb..4400e53b6a8 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1229,15 +1229,17 @@ int main(int argc,char *argv[])
window_resize(0);
#endif
- put_info("Welcome to the MariaDB monitor. Commands end with ; or \\g.",
- INFO_INFO);
- my_snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
- "Your %s connection id is %lu\nServer version: %s\n",
- mysql_get_server_name(&mysql),
- 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 (!status.batch)
+ {
+ put_info("Welcome to the MariaDB monitor. Commands end with ; or \\g.",
+ INFO_INFO);
+ my_snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
+ "Your %s connection id is %lu\nServer version: %s\n",
+ mysql_get_server_name(&mysql),
+ 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);
+ }
#ifdef HAVE_READLINE
initialize_readline((char*) my_progname);