Commit 6b6d40fa authored by Sergei Golubchik's avatar Sergei Golubchik

5.3 merge

parents e1e5ce0d 52340eee
...@@ -1227,7 +1227,7 @@ int main(int argc,char *argv[]) ...@@ -1227,7 +1227,7 @@ int main(int argc,char *argv[])
put_info("Welcome to the MariaDB monitor. Commands end with ; or \\g.", put_info("Welcome to the MariaDB monitor. Commands end with ; or \\g.",
INFO_INFO); INFO_INFO);
sprintf((char*) glob_buffer.ptr(), my_snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
"Your %s connection id is %lu\nServer version: %s\n", "Your %s connection id is %lu\nServer version: %s\n",
mysql_get_server_name(&mysql), mysql_get_server_name(&mysql),
mysql_thread_id(&mysql), server_version_string(&mysql)); mysql_thread_id(&mysql), server_version_string(&mysql));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment