diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-01-28 10:27:52 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-28 10:27:52 +0100 |
commit | 52340eee1a97165af937eb5db0b07ed00163a55e (patch) | |
tree | 62b67de2cb1bd0d3ccf5723eeca2aad2d922345e /client | |
parent | f189ed5009cfd4149aa90ba18bfc9c80de9f0a39 (diff) | |
parent | 19b24f8f5370b32188bf9906774d316e4e37c548 (diff) | |
download | mariadb-git-52340eee1a97165af937eb5db0b07ed00163a55e.tar.gz |
5.2 merge
Diffstat (limited to 'client')
-rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index a811bacdab0..2ff4f3f9000 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1181,7 +1181,7 @@ int main(int argc,char *argv[]) put_info("Welcome to the MariaDB monitor. Commands end with ; or \\g.", 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", mysql_get_server_name(&mysql), mysql_thread_id(&mysql), server_version_string(&mysql)); |