diff options
| author | unknown <Reggie/Reggie@xp.> | 2007-06-07 10:14:53 -0500 |
|---|---|---|
| committer | unknown <Reggie/Reggie@xp.> | 2007-06-07 10:14:53 -0500 |
| commit | 9660eb9009a99aecfcbfb02c2ed198bcb395ca81 (patch) | |
| tree | 5012dfe4a7458e67993cf0bde8403b2588894106 /sql-common | |
| parent | 21e69bc006f79ccc32d2279705d8624669e4802a (diff) | |
| parent | dc266616806e2062ce9053a3cfc755ce76b3f7ac (diff) | |
| download | mariadb-git-9660eb9009a99aecfcbfb02c2ed198bcb395ca81.tar.gz | |
Merge xp.:C:/work/mysql-5.1-new-maint/..\mysql-5.0-maint
into xp.:C:/work/mysql-5.1-new-maint
sql-common/client.c:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 49bb038a479..50da5298591 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -411,7 +411,7 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout) shared_memory_base_name is unique value for each server unique_part is uniquel value for each object (events and file-mapping) */ - suffix_pos = strxmov(tmp,shared_memory_base_name,"_",NullS); + suffix_pos = strxmov(tmp, "Global\\", shared_memory_base_name, "_", NullS); strmov(suffix_pos, "CONNECT_REQUEST"); if (!(event_connect_request= OpenEvent(event_access_rights, FALSE, tmp))) { @@ -465,8 +465,8 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout) unique_part is uniquel value for each object (events and file-mapping) number_of_connection is number of connection between server and client */ - suffix_pos = strxmov(tmp,shared_memory_base_name,"_",connect_number_char, - "_",NullS); + suffix_pos = strxmov(tmp, "Global\\", shared_memory_base_name, "_", connect_number_char, + "_", NullS); strmov(suffix_pos, "DATA"); if ((handle_file_map = OpenFileMapping(FILE_MAP_WRITE,FALSE,tmp)) == NULL) { |