diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-21 16:58:22 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-21 16:58:22 +0200 |
| commit | 02faba53a67cb78905148c06917bf00e9140a382 (patch) | |
| tree | aabb9bcaba3b998cd861d64a84dd198f2ff96149 /sql-common | |
| parent | 73cf7a6c6b107fd68b19ca5a62e8d9e77851091e (diff) | |
| parent | e0e739b628588d5856ab634654347edae21880dd (diff) | |
| download | mariadb-git-02faba53a67cb78905148c06917bf00e9140a382.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 42d3be17798..f6325d923ab 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -397,7 +397,7 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout) HANDLE handle_file_map = NULL; ulong connect_number; char connect_number_char[22], *p; - char tmp[64]; + char *tmp= NULL; char *suffix_pos; DWORD error_allow = 0; DWORD error_code = 0; @@ -405,6 +405,12 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout) char *shared_memory_base_name = mysql->options.shared_memory_base_name; /* + 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)))) + goto err; + + /* The name of event and file-mapping events create agree next rule: shared_memory_base_name+unique_part Where: @@ -546,6 +552,8 @@ err2: CloseHandle(handle_file_map); } err: + if (tmp) + my_free(tmp, MYF(0)); if (error_allow) error_code = GetLastError(); if (event_connect_request) |