diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:38:29 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:38:29 +0200 |
| commit | 6aad537a6aa1381b73e87e53a5a17eda4ef1d452 (patch) | |
| tree | 9366ff2dea102dc28d90ffad1cf8dff3039650e0 /sql-common/client.c | |
| parent | 8ea19fa73e86a3c27917a92affd6a9e43763c7ce (diff) | |
| parent | c7d32876f345785580a7cf286542ccf390b4e1fa (diff) | |
| download | mariadb-git-6aad537a6aa1381b73e87e53a5a17eda4ef1d452.tar.gz | |
Merge MySQL 5.1.39 into MariaDB 5.1.
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index af44b6d2615..c290525a1c0 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -482,6 +482,15 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout) int i; /* + If this is NULL, somebody freed the MYSQL* options. mysql_close() + is a good candidate. We don't just silently (re)set it to + def_shared_memory_base_name as that would create really confusing/buggy + behavior if the user passed in a different name on the command-line or + in a my.cnf. + */ + DBUG_ASSERT(shared_memory_base_name != NULL); + + /* get enough space base-name + '_' + longest suffix we might ever send */ if (!(tmp= (char *)my_malloc(strlen(shared_memory_base_name) + 32L, MYF(MY_FAE)))) @@ -933,6 +942,9 @@ void end_server(MYSQL *mysql) { init_sigpipe_variables DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio))); +#ifdef MYSQL_SERVER + slave_io_thread_detach_vio(); +#endif set_sigpipe(mysql); vio_delete(mysql->net.vio); reset_sigpipe(mysql); @@ -1851,7 +1863,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, uint port, const char *unix_socket,ulong client_flag) { char buff[NAME_LEN+USERNAME_LENGTH+100]; - char *end,*host_info; + char *end,*host_info= NULL; my_socket sock; in_addr_t ip_addr; struct sockaddr_in sock_addr; @@ -1869,7 +1881,6 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, #endif init_sigpipe_variables DBUG_ENTER("mysql_real_connect"); - LINT_INIT(host_info); DBUG_PRINT("enter",("host: %s db: %s user: %s", host ? host : "(Null)", |