diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-08-31 12:40:33 -0700 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-08-31 12:40:33 -0700 |
| commit | e8d45e1be784785fc60bd225d27db0725a5d2500 (patch) | |
| tree | 164c71885c619f941d64b0108f8f11033c34392a /sql-common | |
| parent | f37a5879b4f19aab5be3e6d4ab69d2da60f443b4 (diff) | |
| parent | c3aac11c088b375b0bbeabacb4d27e40261dabaf (diff) | |
| download | mariadb-git-e8d45e1be784785fc60bd225d27db0725a5d2500.tar.gz | |
manual merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 05071865928..84029b449af 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)))) |