database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

manual merge

Browse Source
This commit is contained in:
Tatiana A. Nurnberg
2009-08-31 12:40:33 -07:00
parent f37a5879b4 c3aac11c08
commit e8d45e1be7
2 changed files with 109 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql-common/client.c
View File

@@ -481,6 +481,15 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout)
const char *prefix;
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
*/