summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorunknown <Reggie/Reggie@xp.>2007-06-07 09:53:01 -0500
committerunknown <Reggie/Reggie@xp.>2007-06-07 09:53:01 -0500
commitdc266616806e2062ce9053a3cfc755ce76b3f7ac (patch)
treedfde76b1a58c4ecfd552325f8aa3b64a4cfacc08 /sql-common
parent84bc49889519b3802aa423ada051c1f12c2fe312 (diff)
parent33525fd3d53343e02cc0906017a33ad33bbb1283 (diff)
downloadmariadb-git-dc266616806e2062ce9053a3cfc755ce76b3f7ac.tar.gz
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into xp.:C:/work/mysql-5.0-maint
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 40512da0492..3e5ceb1a738 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -416,7 +416,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)))
{
@@ -470,8 +470,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)
{