diff options
| author | unknown <wax@mysql.com> | 2004-08-19 19:41:30 +0600 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2004-08-19 19:41:30 +0600 |
| commit | 81f7a56f1e6c55ade8dc496359735ec13bc40f92 (patch) | |
| tree | 32b574fcb5aafa1a18184edf5e7a563ba81b3a1e /sql-common | |
| parent | 67fcc9b4d8c48c389ed8d9397a8262de5bc050b0 (diff) | |
| parent | 2ec39e4abe7482c44965d174ebab2db5c9e9d113 (diff) | |
| download | mariadb-git-81f7a56f1e6c55ade8dc496359735ec13bc40f92.tar.gz | |
Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
libmysql/errmsg.c:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 17cc8ed0a8f..4a8bdda5c5e 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1613,7 +1613,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, sock=0; unix_socket = 0; host=mysql->options.shared_memory_base_name; - host_info=(char*) ER(CR_SHARED_MEMORY_CONNECTION); + sprintf(host_info=buff, ER(CR_SHARED_MEMORY_CONNECTION), host); } } #endif /* HAVE_SMEM */ @@ -1677,8 +1677,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, else { net->vio=vio_new_win32pipe(hPipe); - sprintf(host_info=buff, ER(CR_NAMEDPIPE_CONNECTION), host, - unix_socket); + sprintf(host_info=buff, ER(CR_NAMEDPIPE_CONNECTION), unix_socket); } } #endif |