diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-01-28 10:58:18 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-28 10:58:18 +0100 |
commit | 6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb (patch) | |
tree | ebbc1daab4f1a29b12200b478dea0d2af45e9848 /client/mysql.cc | |
parent | e1e5ce0da242c30a744f496dfc5b5a00584d0e56 (diff) | |
parent | 52340eee1a97165af937eb5db0b07ed00163a55e (diff) | |
download | mariadb-git-6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb.tar.gz |
5.3 merge
Diffstat (limited to 'client/mysql.cc')
-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 5e4e80373ad..fbae2310e39 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1227,7 +1227,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)); |